git.immae.eu Git - github/wallabag/wallabag.git/commit

Merge remote-tracking branch 'origin/master' into 2.2

# 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

author	Jeremy Benoist <jeremy.benoist@gmail.com>
	Sat, 19 Nov 2016 14:30:49 +0000 (15:30 +0100)
committer	Jeremy Benoist <jeremy.benoist@gmail.com>
	Sat, 19 Nov 2016 14:30:49 +0000 (15:30 +0100)
commit	68003139e133835805b143b62c4407f19b495dab
tree	9a71a15d021330fb6d55cc338f125161ddfc61dd	tree \| snapshot
parent	bbd4ae7b56d9db744482a5630abad350f2d819af	commit \| diff
parent	cb1a6590c0e58c56d0612066501b3a586b103ed5	commit \| diff

.editorconfig	diff1 \|	diff2 \|	blob \| history
app/Resources/static/themes/baggy/css/main.css	diff1 \|	diff2 \|	blob \| history
app/Resources/static/themes/material/css/main.css	diff1 \|	diff2 \|	blob \| history
app/config/config.yml	diff1 \|	diff2 \|	blob \| history
docs/de/index.rst	diff1 \|	diff2 \|	blob \| history
docs/de/user/configuration.rst	diff1 \|	diff2 \|	blob \| history
docs/de/user/import.rst	diff1 \|	diff2 \|	blob \| history
docs/en/index.rst	diff1 \|	diff2 \|	blob \| history
docs/en/user/configuration.rst	diff1 \|	diff2 \|	blob \| history
docs/en/user/filters.rst	diff1 \|	diff2 \|	blob \| history
docs/en/user/import.rst	diff1 \|	diff2 \|	blob \| history
docs/en/user/parameters.rst	diff1 \|	diff2 \|	blob \| history
docs/fr/index.rst	diff1 \|	diff2 \|	blob \| history
docs/fr/user/configuration.rst	diff1 \|	diff2 \|	blob \| history
docs/fr/user/filters.rst	diff1 \|	diff2 \|	blob \| history
docs/fr/user/import.rst	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Command/InstallCommand.php	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Controller/ConfigController.php	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Entity/Config.php	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Helper/ContentProxy.php	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/config/services.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig	diff1 \|	diff2 \|	blob \| history
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig	diff1 \|	diff2 \|	blob \| history
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php	diff1 \|	diff2 \|	blob \| history
web/bundles/wallabagcore/themes/baggy/css/style.min.css	diff1 \|	diff2 \|	blob \| history
web/bundles/wallabagcore/themes/baggy/js/baggy.min.js	diff1 \|	diff2 \|	blob \| history
web/bundles/wallabagcore/themes/material/css/style.min.css	diff1 \|	diff2 \|	blob \| history
web/bundles/wallabagcore/themes/material/js/material.min.js	diff1 \|	diff2 \|	blob \| history