]> git.immae.eu Git - github/wallabag/wallabag.git/commit - RELEASE_PROCESS.md
Merge remote-tracking branch 'origin/master' into 2.2
authorJeremy Benoist <jeremy.benoist@gmail.com>
Sat, 19 Nov 2016 14:30:49 +0000 (15:30 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Sat, 19 Nov 2016 14:30:49 +0000 (15:30 +0100)
commit68003139e133835805b143b62c4407f19b495dab
tree9a71a15d021330fb6d55cc338f125161ddfc61dd
parentbbd4ae7b56d9db744482a5630abad350f2d819af
parentcb1a6590c0e58c56d0612066501b3a586b103ed5
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
45 files changed:
.editorconfig
app/Resources/static/themes/baggy/css/main.css
app/Resources/static/themes/material/css/main.css
app/config/config.yml
docs/de/index.rst
docs/de/user/configuration.rst
docs/de/user/import.rst
docs/en/index.rst
docs/en/user/configuration.rst
docs/en/user/filters.rst
docs/en/user/import.rst
docs/en/user/parameters.rst
docs/fr/index.rst
docs/fr/user/configuration.rst
docs/fr/user/filters.rst
docs/fr/user/import.rst
package.json
src/Wallabag/CoreBundle/Command/InstallCommand.php
src/Wallabag/CoreBundle/Controller/ConfigController.php
src/Wallabag/CoreBundle/Entity/Config.php
src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
src/Wallabag/CoreBundle/Helper/ContentProxy.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.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
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
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