Merge branch 'upstram_master' into version_3.5

Browse source

# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
#	TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/FileRefController.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
#	TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.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/Adapters/DialogsAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AvatarDrawable.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/FolderBottomSheet.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Stories/StoriesController.java
#	TMessagesProj/src/main/res/values/strings.xml

...

This commit is contained in:

vivabelarus 2023-10-31 13:36:47 +03:00

parent bcbc3df9f7 b4dbcd1639

commit 08efe02310

No known key found for this signature in database

GPG key ID: D8D8542F5B70C314

469 changed files with 40273 additions and 12700 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1304

TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java

View file

File diff suppressed because it is too large Load diff