SchildiChat-android/.gitignore at 4f93eb041c8283c66695e507e5262f603fd8298d - mirrors/SchildiChat-android - Sadium Git

mirrors/SchildiChat-android

mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-21 17:05:39 +03:00

SpiritCroc 4f93eb041c Merge tag 'v1.3.0' into sc

Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68

Conflicts:
	gradle.properties
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/res/layout/reaction_button.xml

2021-09-29 09:55:02 +02:00

22 lines

317 B

Text

Raw Blame History

 *.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
 ktlint
 .tmp_unpatched_strings
 .tmp_new_patched_strings