Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2019-11-01 22:10:32 +01:00
commit 64e5965a02
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -12,16 +12,16 @@
} }
</script> </script>
<div class="panel"> {% if PROVIDER_TEMPLATE_FILE %}
<div class="inner"> <div class="panel">
<div class="inner">
<h2>{{ SITENAME }} - {{ lang('OAUTH_REGISTRATION') }}</h2> <h2>{{ SITENAME }} - {{ lang('OAUTH_REGISTRATION') }}</h2>
{% if PROVIDER_TEMPLATE_FILE %}
{% include PROVIDER_TEMPLATE_FILE %} {% include PROVIDER_TEMPLATE_FILE %}
{% endif %} </div>
</div> </div>
</div> {% endif %}
<form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}> <form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>