STIXProject / stixproject.github.io

Source for the STIX Documentation site
http://stixproject.github.io
BSD 3-Clause "New" or "Revised" License
43 stars 18 forks source link

2 new from US-CERT and Bit9 for Supporters page #242

Closed rroberge closed 9 years ago

rroberge commented 9 years ago

@johnwunder, @bschmoker,

Added US-CERT’s Enhance Shared Situational Awareness (ESSA) Initiative and Bit9’s Carbon Black, both via the google form.

gtback commented 9 years ago

I'm confused by the branches. Was this supposed to merge into master? It looks like it merged into anther branch that is different from master, but before this PR was identical to master?

EDIT: Oh, sorry. #243