Vladimir Diaz 65a9a7c267 Resolve conflicts ... Signed-off-by: Vladimir Diaz <vladimir.v.diaz@gmail.com>		2017-12-11 13:24:19 -05:00
..
client	Merge branch 'tap4' of github.com:theupdateframework/tuf into tap4	2017-10-13 12:29:16 -04:00
keystore	Add new metadata that includes the signing scheme	2017-08-23 10:57:34 -04:00
project	Add valid developer_tool.py metadata	2017-08-29 09:54:31 -04:00
repository	Add metadata that contains 'spec_version'	2017-08-28 15:12:57 -04:00
generate.py	Add copyright and license to unit test scripts	2017-11-30 13:26:44 -05:00
generate_project_data.py	Add copyright and license to unit test scripts	2017-11-30 13:26:44 -05:00
map.json	Add working copy of map.json	2017-02-13 17:42:42 -05:00