]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into setup
authorBart Visscher <bartv@thisnet.nl>
Fri, 31 Jan 2014 15:43:12 +0000 (16:43 +0100)
committerBart Visscher <bartv@thisnet.nl>
Fri, 31 Jan 2014 15:43:12 +0000 (16:43 +0100)
commitbca725dc32e159d756f023d428816b8f9821b732
treec3e1910e952728433c2572cea96fa8024c79d1d5
parent09d2ba017e603fe6ac237da7830d86d74b2da61c
parent271088a7a23ffcdb2082b6dfc5b6f50833612a0f
Merge branch 'master' into setup

Conflicts:
core/setup.php
core/setup/controller.php
lib/base.php
lib/private/util.php