]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into doctrine
authorBart Visscher <bartv@thisnet.nl>
Sun, 10 Mar 2013 10:30:33 +0000 (11:30 +0100)
committerBart Visscher <bartv@thisnet.nl>
Sun, 10 Mar 2013 10:30:33 +0000 (11:30 +0100)
commit7af774cc9817bccc9f8244c61f1dae1ac36e0869
tree0b53cb51065fbe4b4cf64b2fa3d13c98ee6a2315
parente1818675d24f37898f0c50d0804bc458d2acb72f
parent3c06020e3ec1e03aeb689c2e12600be1f95091a7
Merge branch 'master' into doctrine

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