]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into doctrine
authorBart Visscher <bartv@thisnet.nl>
Thu, 25 Apr 2013 16:16:09 +0000 (18:16 +0200)
committerBart Visscher <bartv@thisnet.nl>
Thu, 25 Apr 2013 16:16:09 +0000 (18:16 +0200)
commitbc9792910ae5d714daefd0840d702550b91bae41
treecb290275c715d684e891284aa01e445b59188832
parent28d2379c43b31ec362f1e0b4d09fed3ac9812cd2
parent80e91e1ac6f8c3c3daa0b8e65ab038ebb57b0794
Merge branch 'master' into doctrine

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