snappymail/dev/Settings/User
djmaze f7f56b3789 Merge branch 'master' into UserMailTemplates
# Conflicts:
#	dev/App/User.js
#	dev/Common/Enums.js
#	dev/Screen/User/Settings.js
#	dev/Settings/Admin/General.js
#	snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
#	snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
#	snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
2022-03-15 15:00:14 +01:00
..
Accounts.js Cleanup and better rename settings screens to match template names 2022-03-08 00:51:32 +01:00
Contacts.js Cleanup and better rename settings screens to match template names 2022-03-08 00:51:32 +01:00
Filters.js Dynamic load app.js/admin.js/sieve.js based on minification 2022-03-11 12:58:12 +01:00
Folders.js Cleanup and better rename settings screens to match template names 2022-03-08 00:51:32 +01:00
General.js Cleanup and better rename settings screens to match template names 2022-03-08 00:51:32 +01:00
Security.js Cleanup and better rename settings screens to match template names 2022-03-08 00:51:32 +01:00
Templates.js Merge branch 'master' into UserMailTemplates 2022-03-15 15:00:14 +01:00
Themes.js Cleanup and better rename settings screens to match template names 2022-03-08 00:51:32 +01:00