Partisan-Telegram-Android/TMessagesProj_AppStandalone
vivabelarus 85622b10ab
Merge branch 'upstream_master' into merge/3.7.6
# Conflicts:
#	TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertAudioLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertDocumentLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertPhotoLayout.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/res/values/strings.xml
2024-12-06 23:21:21 +03:00
..
src/main Merge branch 'upstream_master' into merge/3.7.6 2024-12-06 23:21:21 +03:00
.gitignore update to 10.1.0 (3919) 2023-09-22 18:40:36 +04:00
build.gradle Merge branch 'refs/heads/upstream_master' into merge/3.7.4 2024-10-22 01:30:48 +03:00
google-services.json fix google-services.json 2023-11-12 13:57:14 +03:00