[vz-dev] Fixed: andig/volkszaehler.org#1765 (next - 955808a)

[Travis CI]

Build Update for andig/volkszaehler.org
-------------------------------------

Build: #1765
Status: Fixed

Duration: 3 minutes and 24 seconds
Commit: 955808a (next)
Author: andig
Message: Merge branch 'jwt' into next

# Conflicts:
#	composer.json
#	htdocs/js/functions.js
#	lib/Controller/AuthorizationController.php
#	lib/Router.php

View the changeset: https://github.com/andig/volkszaehler.org/compare/664d948135f4...955808a67bd6

View the full build log and details: https://travis-ci.org/andig/volkszaehler.org/builds/331492447?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://demo.volkszaehler.org/pipermail/volkszaehler-dev/attachments/20180121/1211ddd7/attachment.html>