]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into css_cleanup_kondou
authorkondou <kondou@ts.unde.re>
Wed, 24 Jul 2013 18:35:00 +0000 (20:35 +0200)
committerkondou <kondou@ts.unde.re>
Wed, 24 Jul 2013 18:35:00 +0000 (20:35 +0200)
commit92af840a51c51440eb6f55d841b47c1b3f5a1b69
tree1d0fcd7ef38bb121d1710068cf4ef42cc0a9518d
parent4818e0062e5444a9b657a30001b6dbaca44413c7
parentff86b6f1346be9eb90ad82ae49742d22d4ee3e9d
Merge branch 'master' into css_cleanup_kondou

Conflicts:
core/css/styles.css
settings/templates/personal.php
core/css/styles.css
settings/templates/personal.php