Onuray Sahin f028f9836b Merge branch 'develop' into feature/ons/poll_timeline ... * develop: (49 commits) Update changelog.d/4592.bugfix Remove jcenter from here, let's see what the CI will say Common struct for each maven repo Rename the file to group them Add changelog file Revert PR 4592 for devtools Enhance include groups implementation by decoupling them to a separate file Cleanup Legals: improve API to get homeserver terms Legals: update setting icon Auto-review Add a help section in the settings. Changelog Color for links Use same height than the loading item to avoid dynamic resizing Legals: only display external URLs. Legals: Move the 2 copyrights items to the new legal screen Add some space between the 2 TextViews, and improve the layout Legals: Move the 3 element links to the new legal screen Rename some classes ... # Conflicts: # vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml # vector/src/main/res/layout/item_timeline_event_poll_stub.xml		2021-12-13 17:44:21 +03:00
..
assets	Try to communicate with WidgetPostAPI	2020-05-13 20:04:08 +02:00
java/org/matrix	Merge branch 'develop' into feature/ons/poll_timeline	2021-12-13 17:44:21 +03:00
res	Import sas strings	2021-06-18 10:25:37 +02:00
AndroidManifest.xml	Fix warning	2021-09-02 09:43:39 +02:00