cwinfo/powerdns-admin
4
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2025-07-30 17:23:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reslove conflicts

Browse Source 
Signed-off-by: Khanh Ngo <khanh.ngo@taxfix.de>
This commit is contained in:
Khanh Ngo
2021-10-30 21:19:01 +02:00
parent ddf2d4788b d6e64dce8e
commit b7197948c1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
powerdnsadmin/templates/admin_edit_account.html
View File

@@ -162,4 +162,4 @@
} }
}); });
</script> </script>
{% endblock %} {% endblock %}

2
powerdnsadmin/templates/dashboard_domain.html
View File

@@ -15,7 +15,7 @@
{% endmacro %} {% endmacro %}
{% macro serial(domain) %} {% macro serial(domain) %}
{% if domain.serial == 0 %}{{ domain.notified_serial }}{% else %}{{ domain.serial }}{% endif %} {% if domain.serial == '0' %}{{ domain.notified_serial }}{% else %}{{ domain.serial }}{% endif %}
{% endmacro %} {% endmacro %}
{% macro master(domain) %} {% macro master(domain) %}