]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into doctrine
authorBart Visscher <bartv@thisnet.nl>
Fri, 24 May 2013 19:46:42 +0000 (21:46 +0200)
committerBart Visscher <bartv@thisnet.nl>
Fri, 24 May 2013 19:46:42 +0000 (21:46 +0200)
commitd12e44f96a68ed54a7f449eae8673c0276702cad
tree44c9a9b7f1acbf3a21eed4ffbb18f1b384e76470
parentd89e748926f4ea901c0c17f0f7c3651548611b87
parent4911305887840e21452b77f594cdf7e14ed967bf
Merge branch 'master' into doctrine

Conflicts:
lib/MDB2/Driver/sqlite3.php
lib/base.php
lib/db.php
lib/setup.php