Merge pull request #3635 from individual-it/fix_quota_validation

author Morris Jobke <hey@morrisjobke.de>

Tue, 28 Feb 2017 06:27:51 +0000 (00:27 -0600)

committer GitHub <noreply@github.com>

Tue, 28 Feb 2017 06:27:51 +0000 (00:27 -0600)
author Morris Jobke <hey@morrisjobke.de>
Tue, 28 Feb 2017 06:27:51 +0000 (00:27 -0600)
committer GitHub <noreply@github.com>
Tue, 28 Feb 2017 06:27:51 +0000 (00:27 -0600)
diff --cc core/js/js.js
Simple merge
diff --cc core/js/tests/specs/coreSpec.js
Simple merge
diff --cc settings/js/users/users.js
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Tue, 28 Feb 2017 06:27:51 +0000 (00:27 -0600)
committer	GitHub <noreply@github.com>
	Tue, 28 Feb 2017 06:27:51 +0000 (00:27 -0600)
		1	2
core/js/js.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/js/tests/specs/coreSpec.js	patch \|	diff1 \|	diff2 \|	blob \| history
settings/js/users/users.js	patch \|	diff1 \|	diff2 \|	blob \| history