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
|
|
@ -341,4 +341,4 @@ namespace Yavsc.Controllers
|
|||
return View (model);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue