diff options
author | Sjon Hortensius <sjon@hortensius.net> | 2015-01-11 15:24:58 +0100 |
---|---|---|
committer | Sjon Hortensius <sjon@hortensius.net> | 2015-01-11 15:24:58 +0100 |
commit | 8a07e316827f816e9154ede8808b9f71fa66a212 (patch) | |
tree | a4f8d3163fa62f7267be20f7669c4e27998e82f9 /usr/local/www/index.php | |
parent | 41ea4cf39ff9d93f80489d588bef3c34f9539b32 (diff) | |
parent | 6bdb02d36c8a8ada1b770414f0a98c4e0db51c3f (diff) | |
download | pfsense-8a07e316827f816e9154ede8808b9f71fa66a212.zip pfsense-8a07e316827f816e9154ede8808b9f71fa66a212.tar.gz |
Merge branch 'master' into bootstrap
Conflicts occured in copyright message (year-update) due to whitespace difference and themes/ which was removed
Diffstat (limited to 'usr/local/www/index.php')
-rw-r--r-- | usr/local/www/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/index.php b/usr/local/www/index.php index d270eaf..d7c73bc 100644 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -2,7 +2,7 @@ /* $Id$ */ /* index.php - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Copyright (C) 2004-2012 Scott Ullrich All rights reserved. |