user avatar
Merge branch 'master' into fdroid
Michi302 authored
# Conflicts:
#	.magnum.yml
#	.travis.yml
#	README.md
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/commit451/gitlab/LabCoatApp.java
#	build.gradle
c265a2ab
Name Last commit Last update