tom79 9f711a9be5 Merge branch 'develop' into pixelfed_stories ... # Conflicts: # app/src/main/java/app/fedilab/android/client/APIResponse.java		2020-01-18 15:00:26 +01:00
..
assets	Fix live notifications	2019-12-22 18:56:23 +01:00
java/app/fedilab/android	Merge branch 'develop' into pixelfed_stories	2020-01-18 15:00:26 +01:00
res	Merge branch 'develop' into pixelfed_stories	2020-01-18 15:00:26 +01:00
AndroidManifest.xml	media in notifications	2019-12-17 16:37:21 +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