SpiritCroc 25ba52115b Merge tag 'v1.1.15' into sc ... Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4 Conflicts: vector/src/main/assets/open_source_licenses.html vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt vector/src/main/res/drawable/ic_insert_emoji.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/fragment_room_detail.xml vector/src/main/res/layout/item_timeline_event_base.xml vector/src/main/res/xml/vector_settings_labs.xml		2021-08-01 09:37:33 +02:00
..
androidTest/java/org/matrix/android/sdk	Standardise spelling and casing of homeserver	2021-07-15 15:58:50 +01:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Move interface to correct location	2021-01-07 18:28:05 +01:00
main	Merge tag 'v1.1.15' into sc	2021-08-01 09:37:33 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
test/java/org/matrix/android/sdk	Follow the spec regarding waveform content	2021-07-13 17:58:14 +02:00