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
This commit is contained in:
Paul Schneider
2015-10-04 16:36:29 +02:00
21 changed files with 149 additions and 1336 deletions

View File

@ -1,14 +0,0 @@
2015-10-01 Paul Schneider <paul@pschneider.fr>
* TestAPI.csproj:
* packages.config:
2015-07-17 Paul Schneider <paul@pschneider.fr>
* TestAPI.csproj:
* AssemblyInfo.cs:
* TestAutomate.cs: Tests an Automate
* packages.config: using Machine.Specifications