diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
| commit | 0ce35af02acb2fa9fe0ef401dc75345b5114e3d6 (patch) | |
| tree | 5ff19a7cc1bce5901cfeec7e11179ed2682b9e78 /lib/response.php | |
| parent | 7c296a6cf915da6630422ceb8e253ebf9f004964 (diff) | |
| parent | a89199cc7bd19f6ba3e76fcd510219b2bd930ae6 (diff) | |
| download | nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.tar.gz nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.zip | |
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
Diffstat (limited to 'lib/response.php')
0 files changed, 0 insertions, 0 deletions