tom79 8f6aac6d9f Merge branch 'kasun/fedilab-working' into develop ... # Conflicts: # app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java # app/src/main/res/values/strings.xml		2019-11-16 12:10:28 +01:00
..
assets	Improve activity for bookmarks	2019-11-15 16:32:25 +01:00
java/app/fedilab/android	Some fixes	2019-11-16 12:06:05 +01:00
res	Merge branch 'kasun/fedilab-working' into develop	2019-11-16 12:10:28 +01:00
AndroidManifest.xml	Show instance details	2019-11-16 11:36:00 +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