Stefan Schueller 5ea40a1893 Merge branch 'develop'
# Conflicts:
#	.gitlab-ci.yml
#	Dockerfile
#	app/build.gradle
2020-08-29 22:34:23 +02:00
..
2020-08-29 22:33:23 +02:00
2018-03-03 01:10:13 +01:00