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
..
src	Merge tag 'v1.1.15' into sc	2021-08-01 09:37:33 +02:00
.gitignore	Create module for ui-styles	2021-06-15 12:23:54 +02:00
build.gradle	Merge pull request #3598 from vector-im/feature/ons/voice_message	2021-07-30 17:24:17 +03:00