Shpuld Shpludson 1186205583 Merge branch 'develop' into 'feat/relationship-refactor' ... # Conflicts: # src/components/notification/notification.js		2020-05-08 08:35:30 +00:00
..
confirm.js	Revert "add TOTP/Recovery Form for mobile version"	2019-06-12 20:16:55 +00:00
confirm.vue	eslint --fix --ext .js,.vue src	2019-07-05 10:17:44 +03:00
mfa.js	mfa fix	2019-12-30 19:27:44 +09:00
mfa.vue	eslint --fix --ext .js,.vue src	2019-07-05 10:17:44 +03:00
mfa_backup_codes.js	Revert "add TOTP/Recovery Form for mobile version"	2019-06-12 20:16:55 +00:00
mfa_backup_codes.vue	all the manual fixes	2019-07-07 00:54:17 +03:00
mfa_totp.js	Revert "add TOTP/Recovery Form for mobile version"	2019-06-12 20:16:55 +00:00
mfa_totp.vue	eslint --fix --ext .js,.vue src	2019-07-05 10:17:44 +03:00
user_settings.js	add back mute prediction, add getter for relationships	2020-04-24 18:53:17 +03:00
user_settings.vue	Add notification privacy option to user settings	2020-05-06 11:46:40 -05:00