Commit Graph

4 Commits

Author SHA1 Message Date
303e4fa57b Merge commit 'acd2a473bbf4f3006e40384a45413a4db177b082'
Conflicts:
	ChangeLog
	ITContentProvider/ChangeLog
	Makefile
	NpgsqlBlogProvider/ChangeLog
	NpgsqlContentProvider/ChangeLog
	NpgsqlMRPProviders/ChangeLog
	TestAPI/ChangeLog
	web/App_Themes/style.css
	web/ChangeLog
	web/Helpers/YavscHelpers.cs
	web/Models/App.master
	web/Views/Blogs/UserPosts.aspx
2015-10-04 16:36:29 +02:00
acd2a473bb Minor changes
* TestAPI.csproj:
* packages.config:
* packages.config:
* packages.config:
* packages.config:
* packages.config:
* ITContentProvider.csproj:
* NpgsqlMRPProviders.csproj:
* NpgsqlBlogProvider.csproj:
* NpgsqlContentProvider.csproj: Npgsql package update

* Makefile: adds a new line to the end of file

* App.master: Indicates that a login permits to comment
2015-10-04 15:55:10 +02:00
82de63a0ba Npgsql package upgrade 2015-10-01 21:30:05 +02:00
da90e2cb10 * Yavsc.sln:
* Web.csproj:
* TestAPI.csproj:
* YavscModel.csproj:
* Automate.cs:
* TaskOutput.cs:
* AssemblyInfo.cs:
* Service.cs:
* FinalStateException.cs:
* FrontOfficeController.cs:
* InvalidLetterException.cs:
* PriceOnItemCount.cs:

* TestAutomate.cs: Tests an Automate

* packages.config: using Machine.Specifications
2015-07-17 05:07:05 +02:00