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	first commit	2018-10-03 17:58:12 +02:00
build.gradle	Bump appcompat from 1.3.0 to 1.3.1	2021-07-22 12:13:24 +00:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00