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 /etc/inc/gmirror.inc | |
| 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 'etc/inc/gmirror.inc')
| -rw-r--r-- | etc/inc/gmirror.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/gmirror.inc b/etc/inc/gmirror.inc index 2306771..56a021b 100644 --- a/etc/inc/gmirror.inc +++ b/etc/inc/gmirror.inc @@ -2,7 +2,7 @@ /* gmirror.inc Copyright (C) 2009-2014 Jim Pingle - Copyright (C) 2013-2014 Electric Sheep Fencing, LP + Copyright (C) 2013-2015 Electric Sheep Fencing, LP Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: |
