[vz-dev] [volkszaehler/volkszaehler.org] acc283: Fix wamp on https domains

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/volkszaehler.org
  Commit: acc2830094d7a8a812fcf7f288ff68f20c8cf592
      https://github.com/volkszaehler/volkszaehler.org/commit/acc2830094d7a8a812fcf7f288ff68f20c8cf592
  Author: andig <cpuidle at gmx.de>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M htdocs/frontend/javascripts/init.js
    M lib/View/JSON.php

  Log Message:
  -----------
  Fix wamp on https domains


  Commit: 3926e36e04cf1a4f791d18b86bc382ef083bbeab
      https://github.com/volkszaehler/volkszaehler.org/commit/3926e36e04cf1a4f791d18b86bc382ef083bbeab
  Author: andig <cpuidle at gmx.de>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M htdocs/frontend/javascripts/init.js
    M lib/View/JSON.php

  Log Message:
  -----------
  Merge pull request #344 from andig/wss

Fix wamp on https domains


Compare: https://github.com/volkszaehler/volkszaehler.org/compare/59d1d7a63b10...3926e36e04cf