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
..
DataContractJSON.cs	fix ingredient	2 years ago
DataContractXML.cs	changes on passmgr hasher for a permanent one - add user ok	2 years ago
DataPersistence.csproj	merge of comment and user ok - JSONserializer not working	2 years ago
Stubs.cs	merge's resolution not finish	2 years ago