mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-28 22:18:46 +03:00
38c8e30541
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d Conflicts: dependencies.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml vector/src/main/res/drawable/ic_rich_composer_add.xml vector/src/main/res/drawable/ic_rich_composer_send.xml
31 lines
442 B
Text
31 lines
442 B
Text
*.iml
|
|
.gradle
|
|
/local.properties
|
|
# idea files: exclude everything except dictionnaries
|
|
.idea/caches
|
|
.idea/libraries
|
|
.idea/inspectionProfiles
|
|
.idea/sonarlint
|
|
.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
|