settings/admin.php · 3dd19c77589ae107b698cd5c3f66ede028f565aa · die_coolen_jungs / our_own_cloud_project · GitLab

Aug 20, 2013
f1518a54
Merge branch 'master' into clean_up_util · f1518a54
Christopher Schäpers authored Aug 20, 2013
```
Conflicts:
	lib/util.php
```
f1518a54
Merge branch 'master' into clean_up_util
Christopher Schäpers authored Aug 20, 2013
```
Conflicts:
	lib/util.php
```