Zander/zanders-php-markdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into extra; updated version to 1.2.2

Browse source 
Conflicts:

	PHP Markdown Extra Readme.text
	markdown.php
This commit is contained in:
Michel Fortin 2008-06-21 07:46:14 -04:00
commit 5f9587c27c
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PHP Markdown Extra Readme.text
View file

@ -1,7 +1,11 @@
PHP Markdown Extra
==================
<<<<<<< HEAD:PHP Markdown Extra Readme.text
Version 1.2.1 - Tue 27 May 2008
=======
Version 1.0.1m - Sat 21 Jun 2008
>>>>>>> master:PHP Markdown Readme.text
by Michel Fortin
<http://www.michelf.com/>
@ -204,7 +208,7 @@ expected; (3) the output PHP Markdown actually produced.
Version History
---------------
Current Extra:
Extra 1.2.2 (21 Jun 2008):
* Fixed a problem where abbreviation definitions, footnote
definitions and link references were stripped inside
@ -217,7 +221,7 @@ Current Extra:
as HTML entities when used inside a footnote reference id.
Current:
1.0.1m (21 Jun 2008):
* Lists can now have empty items.

6
markdown.php
View file

@ -12,8 +12,8 @@
#
define( 'MARKDOWN_VERSION', "1.0.1l" ); # Sun 11 May 2008
define( 'MARKDOWNEXTRA_VERSION', "1.2.1" ); # Tue 27 May 2008
define( 'MARKDOWN_VERSION', "1.0.1m" ); # Sat 21 Jun 2008
define( 'MARKDOWNEXTRA_VERSION', "1.2.2" ); # Sat 21 Jun 2008
#
@ -71,7 +71,7 @@ function Markdown($text) {
Plugin Name: Markdown Extra
Plugin URI: http://www.michelf.com/projects/php-markdown/
Description: <a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://www.michelf.com/projects/php-markdown/">More...</a>
Version: 1.2.1
Version: 1.2.2
Author: Michel Fortin
Author URI: http://www.michelf.com/
*/