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/usr/local/share/protocols/html.pat | |
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/usr/local/share/protocols/html.pat')
-rw-r--r-- | src/usr/local/share/protocols/html.pat | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/usr/local/share/protocols/html.pat b/src/usr/local/share/protocols/html.pat deleted file mode 100644 index d834a96..0000000 --- a/src/usr/local/share/protocols/html.pat +++ /dev/null @@ -1,11 +0,0 @@ -# (X)HTML - (Extensible) Hypertext Markup Language - http://w3.org -# Pattern attributes: good fast notsofast subset -# Protocol groups: file -# -# Copyright (C) 2008 Matthew Strait, Ethan Sommer; See ../LICENSE -# This pattern has been tested and is believe to work well. - -# this should match any (X)HTML document from any version that conforms -# even vaugly to the standards. -html -<html.*><head> |