Partisan-Telegram-Android/TMessagesProj/src/main/java
vivabelarus 8114b84376
Merge branch 'refs/heads/masking' into masking_note
# Conflicts:
#	TMessagesProj/src/main/AndroidManifest.xml
#	TMessagesProj/src/main/res/drawable-hdpi/ic_launcher_dr.png
#	TMessagesProj/src/main/res/drawable-hdpi/notification.png
#	TMessagesProj/src/main/res/drawable-mdpi/ic_launcher_dr.png
#	TMessagesProj/src/main/res/drawable-mdpi/notification.png
#	TMessagesProj/src/main/res/drawable-xhdpi/ic_launcher_dr.png
#	TMessagesProj/src/main/res/drawable-xhdpi/notification.png
#	TMessagesProj/src/main/res/drawable-xxhdpi/ic_launcher_dr.png
#	TMessagesProj/src/main/res/drawable-xxhdpi/notification.png
#	TMessagesProj/src/main/res/drawable-xxxhdpi/ic_launcher_dr.png
#	gradle.properties
2024-10-20 20:06:28 +03:00
..
androidx/recyclerview/widget update to 10.13.1 (4845) 2024-06-03 10:21:03 +04:00
com update to 11.1.1 (5235) 2024-09-11 01:07:16 +04:00
org Merge branch 'refs/heads/masking' into masking_note 2024-10-20 20:06:28 +03:00