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
..
assets	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
java/app/fedilab/android	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
res	Merge branch 'develop' into pixelfed_stories	2019-11-15 16:39:45 +01:00
AndroidManifest.xml	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
ic_launcher-web.png	Some changes	2019-11-09 14:35:45 +01:00
ic_launcher_bubbles-web.png	Make the app icon changeable	2019-09-25 17:25:03 +05:30