diff options
author | Phil Davis <phil.davis@inf.org> | 2015-11-09 18:01:23 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2015-11-09 18:01:23 +0545 |
commit | ab6e21f4cc0981749aee0bb841c0b3e286d8d0b3 (patch) | |
tree | e63138ed12d305fe5adb3fa422fe3e414f8989c4 /src/usr/local/www/services_unbound_domainoverride_edit.php | |
parent | 0dc2d19598d2b1a7719c3c116b3d0cef98349299 (diff) | |
parent | cb41dd63de768f6cb01008d187206d989d151851 (diff) | |
download | pfsense-ab6e21f4cc0981749aee0bb841c0b3e286d8d0b3.zip pfsense-ab6e21f4cc0981749aee0bb841c0b3e286d8d0b3.tar.gz |
Merge with master
Diffstat (limited to 'src/usr/local/www/services_unbound_domainoverride_edit.php')
-rw-r--r-- | src/usr/local/www/services_unbound_domainoverride_edit.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php index 3d07317..d3c2144 100644 --- a/src/usr/local/www/services_unbound_domainoverride_edit.php +++ b/src/usr/local/www/services_unbound_domainoverride_edit.php @@ -4,11 +4,11 @@ */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. - * Copyright (C) 2014 Warren Baker (warren@decoy.co.za) - * Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net> + * Copyright (c) 2014 Warren Baker (warren@decoy.co.za) + * Copyright (c) 2003-2005 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net> * - * Some or all of this file is based on the m0n0wall project which is - * Copyright (c) 2004 Manuel Kasper (BSD 2 clause) + * Some or all of this file is based on the m0n0wall project which is + * Copyright (c) 2004 Manuel Kasper (BSD 2 clause) * * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: |