Merge tag '4.7.17.3' into develop

4.7.17.3

# Conflicts:
#	changelog.md
#	config/firefly.php
This commit is contained in:
James Cole
2019-07-16 19:24:07 +02:00
8 changed files with 42 additions and 12 deletions

View File

@@ -31,7 +31,7 @@
</div>
</form>
<p>
{{ trans('firefly.search_for_query', {query: query})|raw}}
{{ trans('firefly.search_for_query', {query: query|escape})|raw}}
</p>
{% if modifiers|length > 0 %}
<p>{{ trans('firefly.modifiers_applies_are') }}</p>