gdlbo f6d860c439 Merge remote-tracking branch 'origin/music' ...

# Conflicts:
#	app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
#	app/src/main/java/ru/vtosters/lite/utils/ContactsUtils.java
#	app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java
#	smali/res/values-ru/strings.xml
#	smali/res/values/strings.xml

2022-09-22 19:51:52 +03:00

..

account_preferences.xml

fixed all res

2022-06-19 13:11:07 +03:00

authenticator.xml

fixed all res

2022-06-19 13:11:07 +03:00

contacts_custom_type.xml

fixed all res

2022-06-19 13:11:07 +03:00

empty_pref_screen.xml

add new files

2022-06-18 19:27:15 +03:00

empty.xml

added resources + fixed animfrag

2022-06-19 12:47:35 +03:00

network_security_config_debug.xml

i hate my life

2022-08-27 13:30:12 +03:00

network_security_config.xml

music + ssl v2

2022-06-18 23:29:48 +03:00

notification_settings.xml

fixed all res

2022-06-19 13:11:07 +03:00

preferences_account_milkshake.xml

deleted some useless and dead vk features

2022-07-13 23:45:57 +03:00

preferences_account.xml

deleted some useless and dead vk features

2022-07-13 23:45:57 +03:00

preferences_activity.xml

translate strings

2022-08-22 18:09:35 +03:00

preferences_advanced_notifications_milkshake.xml

fixed all res

2022-06-19 13:11:07 +03:00

preferences_advanced_notifications.xml

fixed all res

2022-06-19 13:11:07 +03:00

preferences_debug.xml

removed legacy ad remover

2022-09-01 21:26:39 +03:00

preferences_feed.xml

[main] translate all strings

2022-09-18 13:05:18 +05:00

preferences_general_milkshake.xml

translate all strings to RU/EN

2022-08-13 20:46:17 +03:00

preferences_general.xml

translate all strings to RU/EN

2022-08-13 20:46:17 +03:00

preferences_gms.xml

translate all strings to RU/EN

2022-08-13 20:46:17 +03:00

preferences_interface.xml

tablet fixes

2022-09-11 02:29:47 +03:00

preferences_media.xml

[music] translate strings

2022-09-21 23:05:01 +05:00

preferences_messages.xml

ios writebar lol

2022-09-18 22:09:48 +03:00

preferences_newsfeed.xml

fixed all res

2022-06-19 13:11:07 +03:00

preferences_other.xml

[main] translate all strings

2022-09-18 13:05:18 +05:00

preferences_proxy.xml

translate strings

2022-08-22 18:09:35 +03:00

preferences_tgs.xml

added resources + fixed animfrag

2022-06-19 12:47:35 +03:00

preferences_themes.xml

tablet fixes

2022-09-11 02:29:47 +03:00

provider_paths.xml

fixed all res

2022-06-19 13:11:07 +03:00

splits0.xml

fixed all res

2022-06-19 13:11:07 +03:00

sync_contacts.xml

fixed all res

2022-06-19 13:11:07 +03:00

widget_player_big_provider.xml

fixed all res

2022-06-19 13:11:07 +03:00

widget_player_provider.xml

fixed all res

2022-06-19 13:11:07 +03:00