diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 15:38:49 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 15:38:49 +0200 |
| commit | bf1057143cdff8ec289d9d766ab100d64d7ea45d (patch) | |
| tree | 6c35d0d99a72f27a981a07c93f0ecbf600764cd4 /apps/files/index.php | |
| parent | 3efe1d3b24e65ed76d521c24b0cfe4e0ff2e7af5 (diff) | |
| parent | 5144d26088b98685a37c73c776a9a47203efa68a (diff) | |
| download | nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.tar.gz nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.zip | |
Merge branch 'master' into routing
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
Diffstat (limited to 'apps/files/index.php')
0 files changed, 0 insertions, 0 deletions