Revision c3c2fd20 - Merge branch 'master' into gettext Resolved conflicts: usr/local/www... - pfSense - pfSense bugtracker

« Previous | Next »

Revision c3c2fd20

Added by Erik Fonnesbeck about 15 years ago

ID c3c2fd205b1563976a278bd11396d055d7818d27
Parent 39c0be7b, 1364604b
Child 649bc342

Merge branch 'master' into gettext

Resolved conflicts:
usr/local/www/system_advanced_firewall.php
usr/local/www/system_routes.php
usr/local/www/system_routes_edit.php

Changes

added
modified
copied
renamed
deleted