diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2014-01-31 16:43:12 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2014-01-31 16:43:12 +0100 |
| commit | bca725dc32e159d756f023d428816b8f9821b732 (patch) | |
| tree | c3e1910e952728433c2572cea96fa8024c79d1d5 /settings/ajax/setquota.php | |
| parent | 09d2ba017e603fe6ac237da7830d86d74b2da61c (diff) | |
| parent | 271088a7a23ffcdb2082b6dfc5b6f50833612a0f (diff) | |
| download | nextcloud-server-bca725dc32e159d756f023d428816b8f9821b732.tar.gz nextcloud-server-bca725dc32e159d756f023d428816b8f9821b732.zip | |
Merge branch 'master' into setup
Conflicts:
core/setup.php
Diffstat (limited to 'settings/ajax/setquota.php')
0 files changed, 0 insertions, 0 deletions