HJ 272b748f26 Merge branch 'develop' into 'allow-opening-profile-in-user-popover' ... # Conflicts: # src/components/settings_modal/tabs/general_tab.vue		2022-08-22 22:29:13 +00:00
..
security_tab	--fix	2022-07-31 12:35:48 +03:00
theme_tab	--fix	2022-07-31 12:35:48 +03:00
data_import_export_tab.js	…
data_import_export_tab.vue	…
filtering_tab.js	…
filtering_tab.vue	…
general_tab.js	Merge branch 'develop' into 'allow-opening-profile-in-user-popover'	2022-08-22 22:29:13 +00:00
general_tab.vue	Merge branch 'develop' into 'allow-opening-profile-in-user-popover'	2022-08-22 22:29:13 +00:00
mutes_and_blocks_tab.js	…
mutes_and_blocks_tab.scss	…
mutes_and_blocks_tab.vue	--fix	2022-07-31 12:35:48 +03:00
notifications_tab.js	…
notifications_tab.vue	…
profile_tab.js	--fix	2022-07-31 12:35:48 +03:00
profile_tab.scss	…
profile_tab.vue	--fix	2022-07-31 12:35:48 +03:00
version_tab.js	…
version_tab.vue	…