Partisan-Telegram-Android/TMessagesProj/src/main
vivabelarus 99a5fd1450
Merge branch 'merge/4.1.2' into debug/fileprotection
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
2025-02-10 18:00:38 +03:00
..
assets Merge branch '4.1.2' into merge/4.1.2 2025-02-06 21:14:55 +03:00
java Merge branch 'merge/4.1.2' into debug/fileprotection 2025-02-10 18:00:38 +03:00
res Merge branch '4.1.2' into merge/4.1.2 2025-02-06 21:14:55 +03:00
AndroidManifest.xml Merge branch 'upstream_master' 2024-11-21 13:28:04 +03:00