Merge remote-tracking branch 'develop/develop' into jordibgzashtita

app/build.gradle

app/src/main/AndroidManifest.xml

app/src/main/assets/release_notes/notes.json

...n/java/app/fedilab/android/activities/WebActivityPub.java

...app/fedilab/android/mastodon/activities/BaseActivity.java

.../fedilab/android/mastodon/activities/BaseBarActivity.java

.../fedilab/android/mastodon/activities/ComposeActivity.java

...pp/fedilab/android/mastodon/activities/MediaActivity.java

...app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java

...todon/ui/fragment/settings/FragmentInterfaceSettings.java

...lab/android/peertube/activities/PeertubeMainActivity.java

...edilab/android/peertube/services/RetrieveInfoService.java

...s/drawable-anydpi-v24/ic_launcher_purple_1_foreground.xml

...n/res/drawable-anydpi-v24/ic_launcher_warm_foreground.xml

...les/mastodon/drawable/ic_launcher_confetti_foreground.xml

...ables/mastodon/drawable/ic_launcher_jungle_foreground.xml

...awables/mastodon/drawable/ic_launcher_leaf_foreground.xml

...ables/mastodon/drawable/ic_launcher_mosaic_foreground.xml

...ables/mastodon/drawable/ic_launcher_offset_foreground.xml

...les/mastodon/drawable/ic_launcher_purple_2_foreground.xml