Commit Graph

104 Commits (e99be67c1ea34a3af359ac0972243b07bfd17d16)

Author SHA1 Message Date
Emmanuelle Vargas-Gonzalez fbce8f15fe Allow no custom __init__() on CustomMarking 2017-11-15 12:55:34 -05:00
Emmanuelle Vargas-Gonzalez f6f7d0aed8 Merge branch 'master' of github.com:oasis-open/cti-python-stix2 2017-11-02 07:48:37 -04:00
Emmanuelle Vargas-Gonzalez a17d770d34 Merge master 2017-11-01 14:17:41 -04:00
Emmanuelle Vargas-Gonzalez 8c56adda21 Update package structure 2017-10-26 11:39:45 -04:00