Partisan-Telegram-Android/TMessagesProj_App
vivabelarus fdf7a216f9
Merge branch 'upstream_master' into merge/4.3.2
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.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/ui/Adapters/ContactsAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/BubbleActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/CallLogActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerActionCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/SettingsSuggestionCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatLinkActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.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/ContactAddActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ExternalActionActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/FiltersSetupActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/InviteContactsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
#	TMessagesProj/src/main/java/org/telegram/ui/PrivacySettingsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PrivacyUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
#	TMessagesProj_AppStandalone/src/main/java/org/telegram/ui/Components/UpdateButton.java
#	TMessagesProj_AppStandalone/src/main/java/org/telegram/ui/Components/UpdateLayout.java
2026-03-19 00:16:36 +03:00
..
src/main update to 11.1.1 (5235) 2024-09-11 01:07:16 +04:00
.gitignore update to 8.9.0 2022-08-12 19:23:51 +04:00
build.gradle Merge branch 'upstream_master' into merge/4.3.2 2026-03-19 00:16:36 +03:00
google-services.json Update from original 8.9.0 2022-08-13 13:52:48 +03:00