mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-21 17:05:39 +03:00
d9c1ec588d
v1.6.0 Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b Conflicts: library/ui-styles/src/main/res/values/styles_app_bar_layout.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector-app/build.gradle vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt vector/src/main/res/layout/dialog_disclaimer_content.xml vector/src/main/res/xml/vector_settings_help_about.xml
37 lines
583 B
Text
37 lines
583 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
|
|
rust-sdk/target/*
|
|
rust-sdk/src/uniffi/*
|
|
Cargo.lock
|
|
|
|
/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
|
|
|
|
# For manual dependency to rust crypto sdk
|
|
library/rustCrypto/matrix-rust-sdk-crypto.aar
|