You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Alexandre AGOSTINHO 41689ae1f5 fix merge conflict + build issues		2 years ago
..
DataManager.cs	merge's resolution not finish	2 years ago
IDataManager.cs	move datamanagers in model, add author properties in recipe	2 years ago
MasterManager.cs	import - export work! - fix get the recipes of the current user	2 years ago