Merge remote-tracking branch 'upstream/master' into master

This commit is contained in:
mmonkey 2020-12-24 03:01:55 -06:00
commit 0cf4c7b7b7

View File

@ -75,7 +75,7 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
<div class="btn btn-default emailconfig"><a id="basic_config" href="{{url_for('admin.configuration')}}">{{_('Edit Basic Configuration')}}</a></div> <div class="btn btn-default emailconfig" id="admin_edit_email"><a href="{{url_for('admin.edit_mailsettings')}}">{{_('Edit E-mail Server Settings')}}</a></div>
</div> </div>
</div> </div>