diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-09-24 00:09:21 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-09-24 00:09:21 +0200 |
| commit | 698394c994a79aa4faa53c2d69e9937d798d8948 (patch) | |
| tree | a78c672623bf596062a50f764d081b1f60ed384f /apps/files/js/files.js | |
| parent | f2de5a34eff78add366b7a89c93a8128a097996f (diff) | |
| parent | 9e4d13858c92e3b42e99152cee7b899a7ddb926b (diff) | |
| download | nextcloud-server-698394c994a79aa4faa53c2d69e9937d798d8948.tar.gz nextcloud-server-698394c994a79aa4faa53c2d69e9937d798d8948.zip | |
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods
Conflicts:
lib/public/iservercontainer.php
lib/server.php
Diffstat (limited to 'apps/files/js/files.js')
0 files changed, 0 insertions, 0 deletions