tom79 8ccfb51c19 Merge branch 'fix_mentions' into develop ... # Conflicts: # app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java		2019-07-04 19:46:36 +02:00
..
activities	Merge branch 'fix_mentions' into develop	2019-07-04 19:46:36 +02:00
animatemenu	last improvements	2019-07-03 11:58:26 +02:00
asynctasks	Fix error when view not focused	2019-07-03 16:57:31 +02:00
client	followed instance name not displayed with Friendica	2019-07-04 11:38:09 +02:00
drawers	FIx mentions quick reply	2019-07-04 19:43:48 +02:00
filelister	Allow to select folder for storing media	2019-07-03 16:50:35 +02:00
fragments	remove option for follow request notifications	2019-07-04 15:44:26 +05:30
helper	Merge branch 'develop' of framagit.org:tom79/fedilab into develop	2019-07-04 19:04:56 +02:00
imageeditor	Move to AndroidX	2019-06-11 19:38:26 +02:00
interfaces	Warn when the account might not see the message in quick replies	2019-06-28 16:24:33 +02:00
jobs	Move to AndroidX	2019-06-11 19:38:26 +02:00
services	Some changes	2019-06-27 18:08:07 +02:00
sqlite	Fix issue with unique id	2019-06-05 14:35:42 +02:00
webview	Move to AndroidX	2019-06-11 19:38:26 +02:00