mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Fix conflicts.

Browse Source 
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Conflicts:
	docs/NEWS
This commit is contained in:
Garvin Hicking
2014-12-19 09:56:10 +01:00
parent c8e147874b dc6d32bf68
commit 2f631807fe
4 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/NEWS
View File

@ -6,6 +6,8 @@ Version 2.0-rc1 (includes beta4/5/6) (December 19th, 2014)
* entryproperties plugin will not automatically disable nl2br
markup, when the WYSIWYG editor is used to create en entry
* PHP Requirement now is at: PHP 5.3+
* Fix for syndication subtome onclick handler
* Fix problematic preview stylesheet reference