Merge branch 'master' into extra
Conflicts: License.text
This commit is contained in:
commit
c10f487ec9
1 changed files with 1 additions and 1 deletions
|
|
@ -1,5 +1,5 @@
|
|||
PHP Markdown & Extra
|
||||
Copyright (c) 2004-2007 Michel Fortin
|
||||
Copyright (c) 2004-2008 Michel Fortin
|
||||
<http://www.michelf.com/>
|
||||
All rights reserved.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue