diff options
| author | Frank Karlitschek <karlitschek@kde.org> | 2011-04-16 18:50:49 +0200 |
|---|---|---|
| committer | Frank Karlitschek <karlitschek@kde.org> | 2011-04-16 18:50:49 +0200 |
| commit | 150631849f5829eaf1f68517b1c81d4339a5f23b (patch) | |
| tree | 6367ab3b09da151e3a83b0942b9bc93a333bcf94 /lib/ocsclient.php | |
| parent | 1419b80d4eba7c57c79e46278a343db3d0a67b40 (diff) | |
| parent | f0e59b9043292a5abfb0b0d21763a0cd7306dad7 (diff) | |
| download | nextcloud-server-150631849f5829eaf1f68517b1c81d4339a5f23b.tar.gz nextcloud-server-150631849f5829eaf1f68517b1c81d4339a5f23b.zip | |
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
Conflicts:
admin/apps.php
Diffstat (limited to 'lib/ocsclient.php')
0 files changed, 0 insertions, 0 deletions