[vz-dev] Fixed: andig/volkszaehler.org#1763 (next - 664d948)

[Travis CI]

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

Build: #1763
Status: Fixed

Duration: 4 minutes and 34 seconds
Commit: 664d948 (next)
Author: andig
Message: Merge branch 'virtual' into next

# Conflicts:
#	composer.json
#	htdocs/js/entity.js
#	htdocs/js/jquery/jquery-extensions.js
#	lib/Interpreter/DataIterator.php
#	lib/Interpreter/Interpreter.php
#	lib/Interpreter/Virtual/DelayedIterator.php
#	lib/Interpreter/Virtual/GroupedTimestampIterator.php
#	lib/Interpreter/Virtual/InterpreterCoordinatorTrait.php
#	lib/Interpreter/Virtual/InterpreterProxy.php
#	lib/Interpreter/Virtual/LookbackIterator.php
#	lib/Interpreter/Virtual/TimestampGenerator.php
#	lib/Interpreter/Virtual/TimestampIterator.php
#	lib/Interpreter/VirtualInterpreter.php
#	test/GroupTest.php
#	test/InterpreterTrait.php
#	test/VirtualTest.php

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

View the full build log and details: https://travis-ci.org/andig/volkszaehler.org/builds/331491547?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/391395c6/attachment-0001.html>