Giacomo 66f1bc3f7a Merge branches 'dawit' and 'master' of https://github.com/reti2vc-2018/SeniorAssistant into dawit ...

# Conflicts:
#	.gradle/4.4/fileHashes/fileHashes.bin
#	.gradle/4.4/fileHashes/fileHashes.lock
#	.idea/gradle.xml
#	.idea/workspace.xml
#	build.gradle
#	src/test/java/TestLights.java

#MaybeThisTimeIsCorrect

2018-06-01 21:33:50 +02:00

1.4 KiB

Raw Blame History

View Raw