Merge branch 'master' into fdroid

# Conflicts:
#	.gitlab-ci.yml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/commit451/gitlab/App.java

No related branches found

No related tags found

No related merge requests found

Pipeline #

Status	Pipeline	Created by	Stages	Actions
Failed 00:02:05 8 years ago	Merge branch 'master' into fdroid #3534317 2.2.6.1-fdroid a7c1cae6 latest tag		Stage: test	Download artifacts No artifacts found
Failed 00:02:16 8 years ago	Merge branch 'master' into fdroid #3534312 fdroid a7c1cae6 branch		Stage: test	Download artifacts No artifacts found

Admin message