Commit Graph

23 Commits

Author SHA1 Message Date
世界
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
DrKLO
aaa5dc0328 Update to 7.2.0 (2128) 2020-10-30 13:26:29 +03:00
世界
490f26fc4b
Merge remote-tracking branch 'upstream/master' 2020-10-01 09:01:48 +00:00
DrKLO
1139e12ef1 Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
世界
5e8de25641
Merge remote-tracking branch 'upstream/master' 2020-07-27 00:58:40 +00:00
DrKLO
520592b43d Update to 6.3.0 (2040) 2020-07-26 11:03:38 +03:00
世界
5eb5f9de51
Native changes 2020-06-25 14:02:59 +00:00
DrKLO
ae0d24ebf2 Update to 6.1.0 (1938) 2020-04-24 12:21:58 +03:00
DrKLO
1eea3ab6f7 Update to 5.13.0 (1820)
Merged some parts of https://github.com/DrKLO/Telegram/pull/1541
2020-01-01 21:32:12 +03:00
DrKLO
f41b228a11 Update to 5.13.0 (1818) 2019-12-31 16:08:08 +03:00
DrKLO
53e04b55fb Update to 5.10.0 2019-08-22 01:53:26 +02:00
DrKLO
ff5735503e Update to 5.9.0 2019-07-18 20:01:39 +07:00
DrKLO
2cf2a45aca Update to 5.6.1 2019-05-14 15:08:05 +03:00
DrKLO
ae90d60e0c Update to 5.2.1 2019-01-23 20:03:33 +03:00
DrKLO
fe599cd519 Update to 4.9.1 2018-08-27 11:33:11 +03:00
DrKLO
d073b80063 Update to 4.9.0 2018-07-30 09:07:02 +07:00
DrKLO
dd679bd7d1 Update to 4.1.1 2017-07-08 19:32:04 +03:00
DrKLO
6a1cf64f6f Update to 3.18.0 2017-03-31 02:58:05 +03:00
DrKLO
e313885ac5 Update to 3.13.1 2016-10-11 13:57:01 +02:00
DrKLO
06473773a6 Update to 3.8.1 2016-04-22 16:49:00 +03:00
DrKLO
74def22213 Update to 3.3.1 2015-11-27 00:04:02 +03:00
DrKLO
496c336d5f Update to 3.2.6 2015-10-29 20:10:07 +03:00
DrKLO
6bb7547f50 Update to 3.2.2 2015-09-24 23:52:02 +03:00