世界 767c9897af Merge remote-tracking branch 'upstream/master' ... # Conflicts: # TMessagesProj/build.gradle # TMessagesProj/src/main/AndroidManifest.xml # TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java # TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java # TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java # TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java # TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java # TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java # TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java # TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java # TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java # TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java # TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java # TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java # TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java # TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java # TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.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/Bulletin.java # TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java # TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java # TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java # TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java # TMessagesProj/src/main/java/org/telegram/ui/PaymentFormActivity.java # TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java # TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java # build.gradle # gradle/wrapper/gradle-wrapper.properties		2020-10-30 14:57:47 +00:00
..
strings_neko.xml	Merges	2020-08-10 10:23:50 +00:00
strings_nekox.xml	New Crowdin updates (#101)	2020-06-26 05:40:23 +00:00
strings.xml	Update to 7.2.0 (2134)	2020-10-30 15:41:45 +03:00