Merge commit 'acd2a473bb'

Browse source

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

parent 40a49f5284 acd2a473bb

commit 303e4fa57b

21 changed files with 143 additions and 1330 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1018

web/ChangeLog

View file

File diff suppressed because it is too large Load diff