Checked gettext() implementation on firewall_nat_out_edit.php
Merge remote branch 'mainline/master' into 2_firewall
Conflicts: usr/local/www/diag_backup.php usr/local/www/diag_dns.php usr/local/www/diag_ipsec_sad.php usr/local/www/diag_logs_vpn.php usr/local/www/diag_ping.php...
Do not call gettext() to print vars
Checked gettext() implementation on firewall_nat_out.php
Checked gettext() implementation on diag_ping.php
Checked gettext() implementation on diag_backup.php
Conflicts: usr/local/www/firewall_nat_out.php usr/local/www/firewall_rules.php usr/local/www/firewall_rules_edit.php
Merge remote branch 'mainline/master' into 1_diag
Conflicts: usr/local/www/diag_ipsec_sad.php
Mark filter dirty after saving
View revisions
Also available in: Atom