Jeremy Benoist
|
68003139e1
|
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
|
2016-11-19 15:30:49 +01:00 |
Nicolas Lœuillet
|
bb624c0269
|
Reordered 🇫🇷 documentation
|
2016-11-17 19:22:16 +01:00 |
|
Nicolas Lœuillet
|
2e389b0b90
|
Reordered documentation
|
2016-11-17 19:22:15 +01:00 |
|
Jeremy Benoist
|
64a8781e45
|
Merge remote-tracking branch 'origin/master' into 2.2
|
2016-10-24 12:03:17 +02:00 |
|
Jeremy Benoist
|
f623516e10
|
SQLite should use utf8, not utf8mb4
|
2016-10-24 10:10:38 +02:00 |
|
Jeremy Benoist
|
b0de88f75d
|
Use statements & update translation
|
2016-10-22 13:13:07 +02:00 |
|
Nicolas Lœuillet
|
18470d7c6a
|
Added french documentation for parameters.yml
|
2016-10-12 13:19:45 +02:00 |
Jeremy Benoist
|
035513b025
|
Use table for parameters.yml
|
2016-10-10 13:42:50 +02:00 |
|
Nicolas Lœuillet
|
ed11d7f731
|
Added page about parameters.yml
|
2016-10-10 13:01:14 +02:00 |