]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into doctrine
authorBart Visscher <bartv@thisnet.nl>
Fri, 7 Dec 2012 10:35:24 +0000 (11:35 +0100)
committerBart Visscher <bartv@thisnet.nl>
Fri, 7 Dec 2012 10:35:57 +0000 (11:35 +0100)
commit89cd8a3fc75f9b96d295ae4292ee92102c3138a6
treeaab017f29362c92e5a3e28c5b84960ee6e0072ea
parent8bb62e74bd14e4fec6ed1cd371d21af0f618076b
parentc487d9fc7e5b1c31069819cc8adc920ab9660513
Merge branch 'master' into doctrine

Conflicts:
lib/base.php
lib/db.php
lib/base.php
lib/db.php