snappymail/dev/App
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
..
Abstract.js Cleanup knockout subscribables 2022-02-17 09:36:29 +01:00
Admin.js allowAdminPanel => adminAllowed 2021-12-28 14:49:21 +01:00
User.js Merge branch 'master' into UserMailTemplates 2022-03-15 15:00:14 +01:00