Marcel Hofer 7d2289c3a7 Merge branch 'master' into admin-login ...

# Conflicts:
#	data/web/js/site/mailbox.js

2019-03-23 21:17:02 +01:00

..

assets

[Assets] Fix Nextcloud site

2019-02-14 10:54:06 +01:00

conf

Merge branch 'master' into admin-login

2019-03-23 21:17:02 +01:00

Dockerfiles

Merge branch 'master' into admin-login

2019-03-23 21:17:02 +01:00

web

Merge branch 'master' into admin-login

2019-03-23 21:17:02 +01:00