Partisan-Telegram-Android/TMessagesProj_AppHuawei
vivabelarus 3b9c4ecd2f
Merge branch 'upstream_master' into merge/4.2.5
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BirthdayController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertAudioLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertDocumentLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPollLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SenderSelectPopup.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/PollCreateActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/SecretMediaViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/PeerStoriesView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/PaintView.java
#	TMessagesProj/src/main/res/values/strings.xml
2025-11-19 19:37:57 +03:00
..
src/main update to 12.2.0 (6289) 2025-11-18 01:19:53 +04:00
.gitignore update to 8.9.0 2022-08-12 19:23:51 +04:00
agconnect-services.json update to 8.9.0 2022-08-12 19:23:51 +04:00
build.gradle Merge branch 'upstream_master' into merge/4.2.5 2025-11-19 19:37:57 +03:00
google-services.json update to 8.9.0 2022-08-12 19:23:51 +04:00