Conflict resolved
Fixed #5017Action button URLs corrected
Deleted orig fileq
Fixed #5020
Fixed #5001
Control element names corrected
Fix incorrect variable references for CARP VIPs. Fixes #5016
Rename shortcut from pgk to pkg
Merge branch 'master' into bootstrap
For captive portal, if a user reloads index.php of the portal while already logged in, show the logout page instead if it's custom.
Must be a custom logout page that does not include a redirect.
Move main pfSense content to src/
View revisions
Also available in: Atom