diff options
| author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
|---|---|---|
| committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
| commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
| tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /view/tpl/admin_site.tpl | |
| parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
| parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
| download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
Diffstat (limited to 'view/tpl/admin_site.tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 9b90fb4b0..c6c15cec4 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -64,10 +64,9 @@ {{include file="field_input.tpl" field=$maximagesize}} <h3>{{$corporate}}</h3> - {{include file="field_input.tpl" field=$allowed_sites}} - {{include file="field_input.tpl" field=$allowed_email}} {{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$force_publish}} + {{include file="field_checkbox.tpl" field=$disable_discover_tab}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> |