7 commits

Author	SHA1	Message	Date
Deborah Servili	31142b41ac	merge	2018-08-14 12:09:21 +02:00
Deborah Servili	a28c50203e	fix	2018-08-14 12:07:12 +02:00
Deborah Servili	2081dc1627	resolve merge confilct -I hope-	2018-08-14 12:06:42 +02:00
Deborah Servili	4e911b2c17	Merge branch 'master' into master	2018-08-14 11:43:59 +02:00
Deborah Servili	a646a835fe	add Rosenbridge backdoor	2018-08-14 10:09:26 +02:00
Christophe Vandeplas	5478f0aa45	no change: dump files with sort_keys=True ... This is needed to keep better track of the changes when other tools load and save the json files.	2018-08-13 17:06:29 +02:00
raw-data	77cfaa8221	[add] new backdoor galaxy and cluster	2018-07-06 20:09:52 +01:00