diff options
| author | raghunayyar <me@iraghu.com> | 2014-01-16 14:42:37 +0530 |
|---|---|---|
| committer | raghunayyar <me@iraghu.com> | 2014-01-16 14:42:37 +0530 |
| commit | 775e08e0ee4125cc7b2a594771437686f6a21b56 (patch) | |
| tree | 362f84449171898335dd3e8511b65c97c150e9e1 /apps/files/tests/js/filesSpec.js | |
| parent | 4687d2dd0bde3f689eb57c90d0c4341cd00991bd (diff) | |
| parent | bd643c47f32ba6d7b3ba6a18ed1591aab0b81be8 (diff) | |
| download | nextcloud-server-775e08e0ee4125cc7b2a594771437686f6a21b56.tar.gz nextcloud-server-775e08e0ee4125cc7b2a594771437686f6a21b56.zip | |
Merge branch 'master' into core-em-to-px
Conflicts:
apps/files_sharing/css/public.css
apps/user_ldap/css/settings.css
core/css/multiselect.css
core/css/share.css
Diffstat (limited to 'apps/files/tests/js/filesSpec.js')
0 files changed, 0 insertions, 0 deletions