]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d12e44f 26c91bf)
Merge branch 'doctrine' of git://github.com/owncloud/core into doctrine
authorBart Visscher <bartv@thisnet.nl>
Fri, 21 Jun 2013 14:43:16 +0000 (16:43 +0200)
committerBart Visscher <bartv@thisnet.nl>
Fri, 21 Jun 2013 14:43:16 +0000 (16:43 +0200)
1  2 
autotest.sh patch | diff1 | diff2 | blob | history

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