diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-07-04 18:23:47 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-07-04 18:23:47 +0200 |
| commit | ad9458e85d319c12575293e0b25069d35db15720 (patch) | |
| tree | 83801af641b47e346bef0d72821b26e5d4cfb0fa /tests/lib/config.php | |
| parent | 32d69f68896c08e216bc0e84db409d00ec654856 (diff) | |
| parent | f67fc78531a0180d3c60edb849b29ac744bacbaa (diff) | |
| download | nextcloud-server-ad9458e85d319c12575293e0b25069d35db15720.tar.gz nextcloud-server-ad9458e85d319c12575293e0b25069d35db15720.zip | |
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
Diffstat (limited to 'tests/lib/config.php')
0 files changed, 0 insertions, 0 deletions