Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: diabook-themes: small-fix add link "remove account" to /mod/settings.php * master:
This commit is contained in:
parent
3ee998dbaf
commit
7b5bab445d