diff options
| author | David Wood <david@wood2.org.uk> | 2015-12-31 13:46:50 +0000 |
|---|---|---|
| committer | David Wood <david@wood2.org.uk> | 2015-12-31 13:46:50 +0000 |
| commit | 60e15be211c5de855ab3d9746c78eb7296c50cde (patch) | |
| tree | 862af8eaa4a8ba95af792b3c98c484e33f2bc2ca /src/etc/rc.conf_mount_ro | |
| parent | 2e4cad90499f968474c4eca0852f352f1526b617 (diff) | |
| parent | 8dccfb20643cfda6b55429177410e6c66fcf0bbd (diff) | |
| download | pfsense-60e15be211c5de855ab3d9746c78eb7296c50cde.zip pfsense-60e15be211c5de855ab3d9746c78eb7296c50cde.tar.gz | |
Merge remote-tracking branch 'upstream/master' into rfc4638, fix conflict with c399d0d
Diffstat (limited to 'src/etc/rc.conf_mount_ro')
| -rwxr-xr-x | src/etc/rc.conf_mount_ro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/etc/rc.conf_mount_ro b/src/etc/rc.conf_mount_ro index 6beb5e8..7e34f3d 100755 --- a/src/etc/rc.conf_mount_ro +++ b/src/etc/rc.conf_mount_ro @@ -1,6 +1,5 @@ #!/usr/local/bin/php-cgi -f <?php -/* $Id$ */ /* rc.conf_mount_ro part of pfSense (https://www.pfsense.org) |
