mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-25 01:03:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src/main
History
SpiritCroc 28f65ec0e8 Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc 
Merge v1.0.5 pt. 5

Conflicts:
	README.md
	vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2020-08-22 10:54:14 +02:00
..
assets RiotX -> Element 2020-07-16 16:01:25 +02:00
java/im/vector/app Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc 2020-08-22 10:54:14 +02:00
play/listings Rename files, Weblate is expecting _ rather than - 2020-08-13 12:20:44 +02:00
res Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc 2020-08-22 10:54:14 +02:00
AndroidManifest.xml Merge commit 'a1f90abcd20d2100e02767a6fd2cfb9969f12a4d' into sc 2020-08-22 10:29:31 +02:00