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

diff --cc app/config/config.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 95c846867d8771eff6f76fe94c520ca95f7c0c3e,4679714e6398355bcdf5355dd04ece6db626821f..859b166b18c8abd4a60cfdfa070cb2c3366a3142
--- 1/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
--- 2/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@@ -27,8 -22,8 +27,8 @@@
      </div>
  
      {% for entry in entries %}
 -        <div id="entry-{{ entry.id|e }}" class="entry">
 +        <div id="entry-{{ entry.id|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}">
-             <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|raw }}</a></h2>
+             <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title|e|raw }}</a></h2>
  
              {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
              <div class="estimatedTime">

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
Simple merge