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
..
sampledata	textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body	2021-06-14 22:10:12 +02:00
signature	Share the debug signature to all machines which build the debug APK	2019-06-07 10:17:14 +02:00
src	Merge tag 'v1.1.15' into sc	2021-08-01 09:37:33 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.1.15' into sc	2021-08-01 09:37:33 +02:00
lint.xml	Remove useless parent	2021-06-11 10:22:18 +02:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00