2 Commits (965d7fa78820ca8b53f0ad9dec577af49f7ba83a)

Author	SHA1	Message	Date
Emmanuelle Vargas-Gonzalez	a042970a1f	Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into stix2.1	2018-07-11 09:41:42 -04:00
Emmanuelle Vargas-Gonzalez	646d941032	Removed 'test_memory' file and moved all tests into 'test_datastore_memory' ... The tests under 'test_memory' were moved into a new file called 'test_datastore_composite' to make clear what we are testing.	2018-07-09 15:15:29 -04:00