sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity
pleroma-fe/src/components/settings
History
Egor Kislitsyn a8521fc8d9 Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions 
# Conflicts:
#	src/i18n/en.json
#	src/modules/interface.js
#	src/modules/users.js
#	yarn.lock
 		2018-12-13 18:22:15 +07:00
..
settings.js Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions 2018-12-13 18:22:15 +07:00
settings.vue Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions 2018-12-13 18:22:15 +07:00