Merge branch 'master' into doctrine (5549c77e) · Commits · github / nextcloud / server

Commit 5549c77e authored Jul 11, 2013 by

Bart Visscher

Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment