Merge commit 'acd2a473bb'
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:
commit
303e4fa57b
21 changed files with 143 additions and 1330 deletions
|
|
@ -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
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue