summaryrefslogtreecommitdiffstats
path: root/3rdparty
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-07-11 18:47:19 +0200
committerBart Visscher <bartv@thisnet.nl>2013-07-13 12:01:14 +0200
commit5549c77ec5256722fc11e92745c8fe769bece285 (patch)
tree876411d0a0181ec31177ec3425c81d25a25760da /3rdparty
parentab2037ab5d215220c7edbd0685f4f3b25d523258 (diff)
parentc5f2ea9a9511e78d724bb1c90748f894bb8b57af (diff)
downloadnextcloud-server-5549c77ec5256722fc11e92745c8fe769bece285.tar.gz
nextcloud-server-5549c77ec5256722fc11e92745c8fe769bece285.zip
Merge branch 'master' into doctrine
Conflicts: 3rdparty lib/db.php lib/setup.php tests/lib/db.php tests/lib/dbschema.php
Diffstat (limited to '3rdparty')
m---------3rdparty0
1 files changed, 0 insertions, 0 deletions
diff --git a/3rdparty b/3rdparty
-Subproject 691791a4f743aaa83546736928e3ce18574f3c0
+Subproject c8623cc80d47022cb25874b69849cd2f57fd487