Merge pull request #648 from nextcloud/add-quotaplugin-v2-master

author Björn Schießle <bjoern@schiessle.org>

Fri, 29 Jul 2016 09:44:34 +0000 (11:44 +0200)

committer GitHub <noreply@github.com>

Fri, 29 Jul 2016 09:44:34 +0000 (11:44 +0200)
author Björn Schießle <bjoern@schiessle.org>
Fri, 29 Jul 2016 09:44:34 +0000 (11:44 +0200)
committer GitHub <noreply@github.com>
Fri, 29 Jul 2016 09:44:34 +0000 (11:44 +0200)
diff --cc build/integration/features/dav-v2.feature
Simple merge
author	Björn Schießle <bjoern@schiessle.org>
	Fri, 29 Jul 2016 09:44:34 +0000 (11:44 +0200)
committer	GitHub <noreply@github.com>
	Fri, 29 Jul 2016 09:44:34 +0000 (11:44 +0200)