Partisan-Telegram-Android/TMessagesProj/config
vivabelarus bbca5fba81
Merge branch 'fixes/4.3.2' into fixes/masking
# Conflicts:
#	TMessagesProj/src/main/AndroidManifest.xml
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/messenger/partisan/Utils.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertLocationLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/PasscodeView.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/FakePasscodeTelegramMessagesActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj_AppStandalone/src/main/java/org/telegram/ui/Components/UpdateButton.java
#	TMessagesProj_AppStandalone/src/main/java/org/telegram/ui/Components/UpdateLayout.java
2026-04-16 12:23:53 +03:00
..
debug Merge branch 'upstream_master' into merge/4.3.2 2026-03-19 00:16:36 +03:00
release Merge branch 'fixes/4.3.2' into fixes/masking 2026-04-16 12:23:53 +03:00
debug.keystore add debug keystore 2022-10-27 17:58:21 +03:00
release.keystore update release.keystore 2022-07-06 22:48:34 +03:00