Merge pull request #4244 from nextcloud/welcome-email

author Morris Jobke <hey@morrisjobke.de>

Fri, 7 Apr 2017 19:52:28 +0000 (14:52 -0500)

committer GitHub <noreply@github.com>

Fri, 7 Apr 2017 19:52:28 +0000 (14:52 -0500)
author Morris Jobke <hey@morrisjobke.de>
Fri, 7 Apr 2017 19:52:28 +0000 (14:52 -0500)
committer GitHub <noreply@github.com>
Fri, 7 Apr 2017 19:52:28 +0000 (14:52 -0500)
diff --cc apps/provisioning_api/lib/Controller/UsersController.php
Simple merge
diff --cc apps/provisioning_api/tests/Controller/UsersControllerTest.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Fri, 7 Apr 2017 19:52:28 +0000 (14:52 -0500)
committer	GitHub <noreply@github.com>
	Fri, 7 Apr 2017 19:52:28 +0000 (14:52 -0500)
		1	2
apps/provisioning_api/lib/Controller/UsersController.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/provisioning_api/tests/Controller/UsersControllerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history