Wallabag - A self hostable application for saving web pages: Save and classify articles. Read them later. Freely.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/master' into 2.2	Jeremy Benoist	2016-11-19	1	-10/+81
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js
\| *	Reordered :fr: documentation	Nicolas Lœuillet	2016-11-17	1	-3/+5
\| \|
\| *	Reordered documentation	Nicolas Lœuillet	2016-11-17	1	-11/+80
\| \|
\| *	Added help on config screen	Nicolas Lœuillet	2016-11-17	1	-1/+1
\| \|
* \|	Add doc	Jeremy Benoist	2016-11-06	1	-0/+16
\|/
*	Fixed links on import page	Nicolas Lœuillet	2016-10-10	1	-2/+2
\|
*	Add Instapaper docs	Jeremy Benoist	2016-09-27	1	-6/+16
\|
*	Added documentation for Readability migration	Nicolas Lœuillet	2016-09-01	1	-5/+16
\|
*	Change documentation about Pocket import	Nicolas Lœuillet	2016-05-05	1	-1/+1
\| \| \| \|	Fix wallabag/docker#8
*	Move some parts in FAQ	Nicolas Lœuillet	2016-05-03	1	-39/+2
\|
*	import and first article french translations	Nicolas Lœuillet	2016-02-20	1	-8/+16
\|
*	Update import.rst	Nicolas Lœuillet	2016-02-01	1	-1/+1
\|
*	[#1590] Add JSON import from wallabag v2	Nicolas Lœuillet	2016-01-20	1	-4/+15
\|
*	documentation cleaning	Nicolas Lœuillet	2016-01-09	1	-0/+25
\|
*	add docs for Import feature	Nicolas Lœuillet	2016-01-02	1	-0/+39