diff options
| author | friendica <info@friendica.com> | 2015-01-31 00:50:20 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-31 00:50:20 -0800 |
| commit | e6a5f7800390e5091743d6a97c6fd8f54c5d1530 (patch) | |
| tree | 20c49c7d11b411b91530ef43374a208274ebbb57 /view/tpl/admin_site.tpl | |
| parent | 4a243b63f7019a1e56ecf03b138cd7fc396236c2 (diff) | |
| parent | 3e5226adc70838c784a0b208de25fffde37a6679 (diff) | |
| download | volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.gz volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.bz2 volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.zip | |
Merge branch 'master' into tres
Conflicts:
include/zot.php
Diffstat (limited to 'view/tpl/admin_site.tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index caeddeecb..a30892f71 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -55,7 +55,8 @@ {{include file="field_input.tpl" field=$register_text}} {{include file="field_select.tpl" field=$register_policy}} {{include file="field_select.tpl" field=$access_policy}} - + {{include file="field_textarea.tpl" field=$allowed_email}} + {{include file="field_textarea.tpl" field=$not_allowed_email}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <h3>{{$upload}}</h3> |