Files
StockMan/VersGen/obj
Samuele E. Locatelli 67d8dc8a64 Merge branch 'develop' of keyhammer:StockMan into develop
Conflicts:
	SiteSelector/bin/SiteSelector.dll
	StockManMVC/bin/StockManMVC.dll
	VersGen/bin/Release/VersGen.dll
	VersGen/obj/Release/TempPE/VersGen.cs.dll
	VersGen/obj/Release/VersGen.dll
2016-10-10 12:00:12 +02:00
..