Skip to content
Snippets Groups Projects
Commit 96e185f1 authored by Robin Appelman's avatar Robin Appelman
Browse files

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
parents 9f914275 77c423d2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 440 additions and 30 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment