]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into doctrine
authorBart Visscher <bartv@thisnet.nl>
Thu, 11 Jul 2013 16:47:19 +0000 (18:47 +0200)
committerBart Visscher <bartv@thisnet.nl>
Sat, 13 Jul 2013 10:01:14 +0000 (12:01 +0200)
commit5549c77ec5256722fc11e92745c8fe769bece285
tree876411d0a0181ec31177ec3425c81d25a25760da
parentab2037ab5d215220c7edbd0685f4f3b25d523258
parentc5f2ea9a9511e78d724bb1c90748f894bb8b57af
Merge branch 'master' into doctrine

Conflicts:
3rdparty
lib/db.php
lib/setup.php
tests/lib/db.php
tests/lib/dbschema.php
3rdparty
lib/db.php
lib/db/statementwrapper.php
tests/lib/db.php