diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-02-20 14:29:23 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-02-20 14:29:23 +0100 |
| commit | 3f6d14be859e7c9f80b81a38f99b8b192e92f935 (patch) | |
| tree | a439609f26a4a9a977e037e1b3565e42be4a2dbb /apps/files/js | |
| parent | 742f54b6d556797bbef2847e546861de0008a28a (diff) | |
| parent | 5144def99bf084f1e415a8734909363725d2925d (diff) | |
| download | nextcloud-server-3f6d14be859e7c9f80b81a38f99b8b192e92f935.tar.gz nextcloud-server-3f6d14be859e7c9f80b81a38f99b8b192e92f935.zip | |
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
Conflicts:
core/css/styles.css
Diffstat (limited to 'apps/files/js')
0 files changed, 0 insertions, 0 deletions