6 Commits

Author	SHA1	Message	Date
Cristina Cochior	84307c7329	updates	2020-09-22 11:56:56 +02:00
Cristina Cochior	edc4874e84	latest mergedjson	2020-09-21 19:33:18 +02:00
Cristina Cochior	3710900007	newest updates	2020-09-21 17:51:16 +02:00
jules	1012524758	good json for now	2020-05-08 11:56:37 +02:00
Cristina Cochior	079bb14ca2	cristinas merged json	2020-01-28 12:25:31 +01:00
zeroth	eace763456	juju's stuff	2019-11-27 18:02:41 +00:00