tom79 d70e9b07b7 Merge branch 'develop' into pixelfed_stories ... # Conflicts: # app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java # app/src/main/java/app/fedilab/android/client/PixelfedAPI.java # app/src/main/java/app/fedilab/android/helper/Helper.java # app/src/main/res/values/strings.xml		2019-11-15 16:39:45 +01:00
..
activities	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
asynctasks	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
client	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
drawers	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
filelister	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
fragments	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
helper	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
imageeditor	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
interfaces	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
jobs	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
services	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
sqlite	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
webview	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00