Merge pull request #1449 from nextcloud/comments-user-mention

author Morris Jobke <hey@morrisjobke.de>

Mon, 17 Oct 2016 07:30:47 +0000 (09:30 +0200)

committer GitHub <noreply@github.com>

Mon, 17 Oct 2016 07:30:47 +0000 (09:30 +0200)
author Morris Jobke <hey@morrisjobke.de>
Mon, 17 Oct 2016 07:30:47 +0000 (09:30 +0200)
committer GitHub <noreply@github.com>
Mon, 17 Oct 2016 07:30:47 +0000 (09:30 +0200)
diff --cc lib/private/AppFramework/DependencyInjection/DIContainer.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Mon, 17 Oct 2016 07:30:47 +0000 (09:30 +0200)
committer	GitHub <noreply@github.com>
	Mon, 17 Oct 2016 07:30:47 +0000 (09:30 +0200)