]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge remote-tracking branch 'origin/master' into 2.2
authorJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 24 Oct 2016 10:03:17 +0000 (12:03 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Mon, 24 Oct 2016 10:03:17 +0000 (12:03 +0200)
commit64a8781e453c40ff144d03405abe2dc1ccfacbe0
tree311473a357e3dedd496e1417293eed9a2a116ad6
parent9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5
parentc64b4941d5222586a82d2c8d6a61969bb9cfe96b
Merge remote-tracking branch 'origin/master' into 2.2
18 files changed:
app/config/config.yml
docs/en/user/configuration.rst
docs/en/user/parameters.rst
docs/fr/user/configuration.rst
src/Wallabag/CoreBundle/Command/InstallCommand.php
src/Wallabag/CoreBundle/Resources/config/services.yml
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.ro.yml
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig