]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge git://gitorious.org/~icewind/owncloud/icewinds-owncloud into merge
authorRobin Appelman <icewind1991@gmail.com>
Fri, 9 Jul 2010 11:43:40 +0000 (13:43 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Fri, 9 Jul 2010 11:43:40 +0000 (13:43 +0200)
Conflicts:
inc/MDB2/Driver/Function/pgsql.php
inc/MDB2/Driver/Manager/mysql.php
inc/MDB2/Driver/Reverse/pgsql.php
inc/MDB2/Driver/mysql.php
inc/lib_base.php

1  2 
inc/lib_base.php
inc/templates/adminform.php

Simple merge
Simple merge