Merge remote-tracking branch 'upstream/develop' into windows-locale

2026-05-04 13:16:31 +00:00 · 2020-08-02 15:33:22 +02:00
parent bff6c81ed2 bb6f4843b9
commit e74bce197f
2 changed files with 0 additions and 2 deletions
--- a/resources/views/v1/preferences/index.twig
+++ b/resources/views/v1/preferences/index.twig
@@ -72,7 +72,6 @@
                                        <ul class="text-warning">

                                            {% if IS_DEMO_SITE %}<li class="text-danger">{{ 'pref_locale_no_demo'|_ }}</li>{% endif %}
-                                            <li>{{ 'pref_locale_no_docker'|_ }}</li>
                                        </ul>
                                    </div>
                                    {% else %}