Partisan-Telegram-Android/TMessagesProj/config
vivabelarus 4c0e1fb85a
Merge remote-tracking branch 'refs/remotes/upstream/master' into merge/3.7.3
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
#	TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.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/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/JoinCallByUrlAlert.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/SenderSelectPopup.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/EditWidgetActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LogoutActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/PrivacySettingsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stars/StarsController.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/recorder/StoryPrivacyBottomSheet.java
#	TMessagesProj/src/main/res/values-ar/strings.xml
#	TMessagesProj/src/main/res/values-de/strings.xml
#	TMessagesProj/src/main/res/values-es/strings.xml
#	TMessagesProj/src/main/res/values-it/strings.xml
#	TMessagesProj/src/main/res/values-ko/strings.xml
#	TMessagesProj/src/main/res/values-nl/strings.xml
#	TMessagesProj/src/main/res/values-pt-rBR/strings.xml
#	TMessagesProj/src/main/res/values/strings.xml
#	TMessagesProj_AppStandalone/src/main/java/org/telegram/ui/Components/UpdateLayout.java
#	build.gradle
#	gradle.properties
2024-09-11 11:18:46 +03:00
..
debug Merge remote-tracking branch 'refs/remotes/upstream/master' into merge/3.7.3 2024-09-11 11:18:46 +03:00
release Merge remote-tracking branch 'refs/remotes/upstream/master' into merge/3.7.3 2024-09-11 11:18:46 +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