Commit Graph

1358 Commits

Author SHA1 Message Date
tom79 d5050a0ba5 test 2019-05-18 16:47:49 +02:00
tom79 61dfdc9bd6 Merge branch 'bug_fixes' into develop
# Conflicts:
#	app/src/main/res/layout/drawer_status.xml
2019-05-18 15:01:16 +02:00
tom79 fd922e7034 Fix an issue with notifications 2019-05-18 14:58:54 +02:00
tom79 0385a7131e Fix an issue with notifications 2019-05-18 14:52:12 +02:00
Thomas ea5201ce7c Merge branch 'working' into 'develop'
some changes

Closes #466

See merge request tom79/mastalab!2421
2019-05-18 12:35:35 +00:00
tom79 08eda577ef Fix divider issue 2019-05-18 12:44:44 +02:00
tom79 8a4f7f65a2 Update cache with actions 2019-05-18 12:10:08 +02:00
tom79 486f5af333 Change package name + app id 2019-05-18 11:10:30 +02:00