]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into master-sqlserver
authorThomas Mueller <thomas.mueller@tmit.eu>
Mon, 18 Feb 2013 10:39:04 +0000 (11:39 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Mon, 18 Feb 2013 10:39:04 +0000 (11:39 +0100)
1  2 
core/templates/installation.php
lib/db.php

Simple merge
diff --cc lib/db.php
Simple merge