settings/admin.php · e1c5b31d6544b5f7700888526f7e55b66e677498 · TeDomum / Nextcloud · GitLab

Snippets Groups Projects

12 years ago
5788d36c
Merge branch 'master' into fixing-1354-master · 5788d36c
Thomas Müller authored 12 years ago
```
Conflicts:
	settings/admin.php
	settings/templates/admin.php
```
5788d36c

History
Merge branch 'master' into fixing-1354-master
Thomas Müller authored 12 years ago
```
Conflicts:
	settings/admin.php
	settings/templates/admin.php
```