]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into migration
authorTom Needham <needham.thomas@gmail.com>
Sat, 31 Mar 2012 22:44:50 +0000 (22:44 +0000)
committerTom Needham <needham.thomas@gmail.com>
Sat, 31 Mar 2012 22:44:50 +0000 (22:44 +0000)
1  2 
lib/db.php

diff --cc lib/db.php
Simple merge