diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-31 10:55:59 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-31 10:55:59 +0100 |
| commit | 54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7 (patch) | |
| tree | 48c2eb0ad04a4bd921f223258e41beba2e2c6539 /apps/files/js/admin.js | |
| parent | 9c83b307f6d49f30c4cc6db7258d7e3851bac0b7 (diff) | |
| parent | 00a30e665128352e9b20268ea65400a968903c74 (diff) | |
| download | nextcloud-server-54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7.tar.gz nextcloud-server-54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7.zip | |
fix merge conflict
Diffstat (limited to 'apps/files/js/admin.js')
0 files changed, 0 insertions, 0 deletions