guille 9287da7a66 correct merge errors		2022-04-11 12:44:23 -04:00
..
construction	Merge remote-tracking branch 'origin/master'	2022-04-11 12:39:45 -04:00
data_models	Merge remote-tracking branch 'origin/master'	2022-04-11 12:39:45 -04:00
greenery	Modifications in readme and code of conduct	2022-04-08 18:03:35 -04:00
catalog.py	Merge remote-tracking branch 'origin/master'	2022-04-11 12:39:45 -04:00
construction_catalog_factory.py	correct merge errors	2022-04-11 12:44:23 -04:00
greenery_catalog_factory.py	Modifications in readme and code of conduct	2022-04-08 18:03:35 -04:00