tom79 c9c89dada0 Merge branch 'k-a-s-u-n/mastalab-working' into develop ... # Conflicts: # app/src/main/res/values/strings.xml		2019-04-25 18:52:52 +02:00
..
activities	Merge branch 'k-a-s-u-n/mastalab-working' into develop	2019-04-25 18:52:52 +02:00
asynctasks	Fix some issues	2019-04-25 07:38:34 +02:00
client	Some improvements	2019-04-25 18:40:10 +02:00
drawers	Merge branch 'k-a-s-u-n/mastalab-working' into develop	2019-04-25 18:52:52 +02:00
fragments	Merge branch 'k-a-s-u-n/mastalab-working' into develop	2019-04-25 18:52:52 +02:00
helper	Merge branch 'k-a-s-u-n/mastalab-working' into develop	2019-04-25 18:52:52 +02:00
interfaces	Fix some issues	2019-04-25 07:38:34 +02:00
jobs	Start splitting notification Fragment	2019-02-03 12:07:43 +01:00
services	Fix issue #886 - Add live notifications for Pleroma	2019-04-17 17:56:33 +02:00
sqlite	Merge branch 'reorder_timeline' into develop	2019-04-25 18:43:16 +02:00
webview	Fix typo	2019-03-25 18:50:48 +01:00