Merge pull request #3173 from wallabag/domain-name-param

author Jérémy Benoist <j0k3r@users.noreply.github.com>

Sat, 10 Jun 2017 09:36:03 +0000 (11:36 +0200)

committer GitHub <noreply@github.com>

Sat, 10 Jun 2017 09:36:03 +0000 (11:36 +0200)
author Jérémy Benoist <j0k3r@users.noreply.github.com>
Sat, 10 Jun 2017 09:36:03 +0000 (11:36 +0200)
committer GitHub <noreply@github.com>
Sat, 10 Jun 2017 09:36:03 +0000 (11:36 +0200)
diff --cc src/Wallabag/CoreBundle/Resources/config/services.yml
Simple merge
diff --cc src/Wallabag/UserBundle/Resources/config/services.yml
Simple merge
diff --cc tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
Simple merge
author	Jérémy Benoist <j0k3r@users.noreply.github.com>
	Sat, 10 Jun 2017 09:36:03 +0000 (11:36 +0200)
committer	GitHub <noreply@github.com>
	Sat, 10 Jun 2017 09:36:03 +0000 (11:36 +0200)
		1	2
src/Wallabag/CoreBundle/Resources/config/services.yml	patch \|	diff1 \|	diff2 \|	blob \| history
src/Wallabag/UserBundle/Resources/config/services.yml	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history