]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
authorJörn Friedrich Dreyer <jfd@butonic.de>
Thu, 20 Feb 2014 13:29:23 +0000 (14:29 +0100)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Thu, 20 Feb 2014 13:29:23 +0000 (14:29 +0100)
commit3f6d14be859e7c9f80b81a38f99b8b192e92f935
treea439609f26a4a9a977e037e1b3565e42be4a2dbb
parent742f54b6d556797bbef2847e546861de0008a28a
parent5144def99bf084f1e415a8734909363725d2925d
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core

Conflicts:
core/css/styles.css
core/css/styles.css
core/templates/layout.guest.php
core/templates/layout.user.php