mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-21 17:05:39 +03:00
fe785613e7
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e Conflicts: vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt vector/src/main/res/layout/composer_layout.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
30 lines
426 B
Text
30 lines
426 B
Text
*.iml
|
|
.gradle
|
|
/local.properties
|
|
# idea files: exclude everything except dictionnaries
|
|
.idea/caches
|
|
.idea/libraries
|
|
.idea/inspectionProfiles
|
|
.idea/*.xml
|
|
.DS_Store
|
|
/build
|
|
/benchmark-out
|
|
/captures
|
|
.externalNativeBuild
|
|
|
|
/tmp
|
|
/fastlane/private
|
|
/fastlane/report.xml
|
|
/fastlane/README.md
|
|
|
|
/**/build
|
|
|
|
# Added by SC
|
|
.tmp_unpatched_strings
|
|
.tmp_new_patched_strings
|
|
|
|
# Added by yarn
|
|
/package.json
|
|
/yarn.lock
|
|
/node_modules
|
|
**/out/failures
|