snappymail/dev/Screen
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
..
Admin Cleanup views system 2022-03-08 12:28:16 +01:00
User Merge branch 'master' into UserMailTemplates 2022-03-15 15:00:14 +01:00
AbstractSettings.js Split Sieve/Filters code from app.js so that i can work on the new Sieve GUI 2022-03-11 10:26:25 +01:00