diff options
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/release-notes.adoc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docbook/release-notes.adoc b/docbook/release-notes.adoc index aa4f69db0d..5358e6a9ca 100644 --- a/docbook/release-notes.adoc +++ b/docbook/release-notes.adoc @@ -68,7 +68,11 @@ ScyllaDB RPC Dynamic Link Exchange Protocol (DLEP) LBM Stateful Resolution Service (LBMSRS) Asphodel Protocol +<<<<<<< HEAD Technically Enhanced Capture Module Protocol (TECMP) +======= +Fortinet Single Sign-on (FSSO) +>>>>>>> WIP: Add FSSO (Fortinet Single Sign-On) Dissector -- === Updated Protocol Support |