Merge branch 'master' into UserMailTemplates

Browse source

# 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

...

This commit is contained in:

djmaze 2022-03-15 15:00:14 +01:00

parent 05e7a123e8 57673384e9

commit f7f56b3789

794 changed files with 96444 additions and 74188 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

848

dev/App/User.js

View file

File diff suppressed because it is too large Load diff