Partisan-Telegram-Android/TMessagesProj
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
..
config Merge remote-tracking branch 'refs/remotes/upstream/master' into merge/3.7.3 2024-09-11 11:18:46 +03:00
jni Merge remote-tracking branch 'upstream/master' into merge/4.1.2 2025-02-05 17:48:13 +03:00
libs
src/main Merge branch 'merge/4.1.2' into debug/fileprotection 2025-02-10 18:00:38 +03:00
build.gradle restart app after enabling file protection 2025-01-15 15:34:28 +03:00
google-services.json update to 11.1.1 (5235) 2024-09-11 01:07:16 +04:00
proguard-rules-beta.pro update to 11.1.1 (5235) 2024-09-11 01:07:16 +04:00
proguard-rules.pro Merge branch 'upstream_master' 2024-11-21 13:28:04 +03:00