]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into append-error-document
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 2 Apr 2014 06:48:37 +0000 (08:48 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 2 Apr 2014 06:48:37 +0000 (08:48 +0200)
commit7086c386fdd1cfcec0ddc0db19615bd4586bade3
tree26d7a890bc0350af5260bb7a3736610e533e6d3b
parent229e3dcba86db3bd91bbddd78079bf340edff710
parent73dd5ff26c2d7652fd4abacbac53d734f64fde96
Merge branch 'master' into append-error-document

Conflicts:
lib/private/setup.php
lib/private/updater.php
lib/private/setup.php
lib/private/updater.php