grr conflicts

This commit is contained in:
Garvin Hicking 2014-02-04 11:23:55 +01:00
parent 775cd039d2
commit e1afbd1cb8

View File

@ -3,6 +3,11 @@
Version 1.7.6 ()
------------------------------------------------------------------------
* Fixed nl2br non-working WYSIWYG treatment and added general markup behaviour notes
* Fixed textile compat fix
Version 1.7.5 (January 18th, 2014)
------------------------------------------------------------------------