Thomas fd400f025e Merge branch 'donation_google' into develop ... # Conflicts: # .gitignore		2021-01-08 17:45:00 +01:00
..
assets	Support Emoji and replies	2020-10-15 15:16:41 +02:00
java/app/fedilab/fedilabtube	Merge branch 'donation_google' into develop	2021-01-08 17:45:00 +01:00
res	Some changes	2021-01-07 17:39:47 +01:00
AndroidManifest.xml	Allow connection of Mastodon & Pleroma accounts	2020-12-31 11:19:43 +01:00