]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit96e185f15033047b37a5dbb9c7d1467db6b5b8e1
tree5f77fbec5bd0dbf0a6b8a4c0ceca472823e05c80
parent9f914275db3f95cb001e635898d5a5a634563bd4
parent77c423d27bcd255f5490d1592ed104d09e2040c6
Merge git://gitorious.org/~icewind/owncloud/icewinds-owncloud into merge

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
inc/lib_base.php
inc/templates/adminform.php