[vz-dev] [volkszaehler/volkszaehler.org] e71f79: Merge remote-tracking branch 'upstream/master' int...

[GitHub]

  Branch: refs/heads/upstream-development
  Home:   https://github.com/volkszaehler/volkszaehler.org
  Commit: e71f79cd42b543a75e571968905649c3c30ddcb0
      https://github.com/volkszaehler/volkszaehler.org/commit/e71f79cd42b543a75e571968905649c3c30ddcb0
  Author: andig <cpuidle at gmx.de>
  Date:   2015-06-21 (Sun, 21 Jun 2015)

  Changed paths:
    M composer.json
    A htdocs/frontend/icons/android-chrome-144x144.png
    A htdocs/frontend/icons/android-chrome-192x192.png
    A htdocs/frontend/icons/android-chrome-36x36.png
    A htdocs/frontend/icons/android-chrome-48x48.png
    A htdocs/frontend/icons/android-chrome-72x72.png
    A htdocs/frontend/icons/android-chrome-96x96.png
    A htdocs/frontend/icons/apple-touch-icon-114x114.png
    A htdocs/frontend/icons/apple-touch-icon-120x120.png
    A htdocs/frontend/icons/apple-touch-icon-144x144.png
    A htdocs/frontend/icons/apple-touch-icon-152x152.png
    A htdocs/frontend/icons/apple-touch-icon-180x180.png
    A htdocs/frontend/icons/apple-touch-icon-57x57.png
    A htdocs/frontend/icons/apple-touch-icon-60x60.png
    A htdocs/frontend/icons/apple-touch-icon-72x72.png
    A htdocs/frontend/icons/apple-touch-icon-76x76.png
    A htdocs/frontend/icons/apple-touch-icon-precomposed.png
    A htdocs/frontend/icons/apple-touch-icon.png
    A htdocs/frontend/icons/browserconfig.xml
    A htdocs/frontend/icons/favicon-16x16.png
    A htdocs/frontend/icons/favicon-32x32.png
    A htdocs/frontend/icons/favicon-96x96.png
    A htdocs/frontend/icons/favicon.ico
    A htdocs/frontend/icons/manifest.json
    A htdocs/frontend/icons/mstile-144x144.png
    A htdocs/frontend/icons/mstile-150x150.png
    A htdocs/frontend/icons/mstile-310x150.png
    A htdocs/frontend/icons/mstile-310x310.png
    A htdocs/frontend/icons/mstile-70x70.png
    M htdocs/frontend/index.html
    M htdocs/frontend/javascripts/functions.js
    M htdocs/frontend/javascripts/init.js
    M htdocs/frontend/javascripts/options.js
    M htdocs/frontend/javascripts/wui.js
    M lib/Volkszaehler/Controller/CapabilitiesController.php
    M lib/Volkszaehler/Controller/Controller.php
    M lib/Volkszaehler/Router.php
    M lib/Volkszaehler/View/JSON.php
    M lib/Volkszaehler/View/View.php
    M lib/bootstrap.php
    R misc/tests/README
    R misc/tests/ajax.php
    R misc/tests/big_channel_data.php
    R misc/tests/configuration.php
    R misc/tests/debug.php
    R misc/tests/json.php
    R misc/tests/pdobench.php
    R misc/tests/properties.php
    R misc/tests/random.php
    R misc/tests/test.conf.php
    M misc/tools/install.sh
    R misc/tools/vzcompress
    M misc/tools/vzcompress2.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into upstream-development