diff options
author | Robin Appelman <icewind1991@gmail.com> | 2011-09-18 13:47:15 +0200 |
---|---|---|
committer | Robin Appelman <icewind1991@gmail.com> | 2011-09-18 13:47:15 +0200 |
commit | b86367866e6f904ca994e84c64af9e1fb699e98b (patch) | |
tree | 5f78fd5734cc36776012e78c91c02d4ffe28f905 /settings/templates/admin.php | |
parent | 5e3ecbbf96ff0268220a85aaef3c99c84e13ab44 (diff) | |
parent | 0714e83a8e9f6c793822b02b870686294b949763 (diff) | |
download | nextcloud-server-b86367866e6f904ca994e84c64af9e1fb699e98b.tar.gz nextcloud-server-b86367866e6f904ca994e84c64af9e1fb699e98b.zip |
merge master into database
Diffstat (limited to 'settings/templates/admin.php')
0 files changed, 0 insertions, 0 deletions