]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
authorkondou <kondou@ts.unde.re>
Fri, 21 Mar 2014 19:23:31 +0000 (20:23 +0100)
committerkondou <kondou@ts.unde.re>
Fri, 21 Mar 2014 19:23:31 +0000 (20:23 +0100)
commitdda7129a243c7ebdbcdf9c2b5dbf167542402bc2
treed03dff6783ebabb6273a19ed59a6b9b3731e923e
parent556c6eca2397eaa03c4503822d647c8b6cb5e70e
parent4be0b3f6cce540282c6745d6bf3d2a0fa4ac65b4
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
cron.php
settings/admin.php
settings/templates/admin.php