]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d89e748 4911305)
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)
Conflicts:
lib/MDB2/Driver/sqlite3.php
lib/base.php
lib/db.php

1  2 
lib/setup.php patch | diff1 | diff2 | blob | history

diff --cc lib/setup.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server