Merge pull request #1824 from wallabag/v2-alternative-env

author Jeremy Benoist <j0k3r@users.noreply.github.com>

Fri, 8 Apr 2016 19:03:17 +0000 (21:03 +0200)

committer Jeremy Benoist <j0k3r@users.noreply.github.com>

Fri, 8 Apr 2016 19:03:17 +0000 (21:03 +0200)
author Jeremy Benoist <j0k3r@users.noreply.github.com>
Fri, 8 Apr 2016 19:03:17 +0000 (21:03 +0200)
committer Jeremy Benoist <j0k3r@users.noreply.github.com>
Fri, 8 Apr 2016 19:03:17 +0000 (21:03 +0200)
diff --cc composer.json
Simple merge
diff --cc docs/en/user/installation.rst
Simple merge
diff --cc docs/fr/user/installation.rst
Simple merge
author	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Fri, 8 Apr 2016 19:03:17 +0000 (21:03 +0200)
committer	Jeremy Benoist <j0k3r@users.noreply.github.com>
	Fri, 8 Apr 2016 19:03:17 +0000 (21:03 +0200)
		1	2
composer.json	patch \|	diff1 \|	diff2 \|	blob \| history
docs/en/user/installation.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/fr/user/installation.rst	patch \|	diff1 \|	diff2 \|	blob \| history