diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-03 17:04:16 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-03 17:04:16 +0200 |
| commit | 14a53819777f5cb829aa15f8d749c9ae71d39b4e (patch) | |
| tree | bd32bfd88a60ac20a7d5a00a559fffb705a9279e /apps/files/js | |
| parent | c0ebc1dfb1108b7cbe0fa134def00aa6ce0066b3 (diff) | |
| parent | e2969062ca172b46713653ac243bb849a54ca7d7 (diff) | |
| download | nextcloud-server-14a53819777f5cb829aa15f8d749c9ae71d39b4e.tar.gz nextcloud-server-14a53819777f5cb829aa15f8d749c9ae71d39b4e.zip | |
Merge branch 'master' into fs-backend-registration
Conflicts:
apps/files_external/templates/settings.php
Diffstat (limited to 'apps/files/js')
0 files changed, 0 insertions, 0 deletions