Merge branch 'master' into develop

This commit is contained in:
Estevão Soares dos Santos 2015-05-15 22:33:28 +01:00
commit 19b0210969
2 changed files with 3 additions and 3 deletions

View File

@ -1,8 +1,8 @@
Credits Credits
======= =======
- Showdown v2 - Showdown v2
* [Estevão Santos](http://soares-dos-santos.com)<br/> * [Estevão Santos](http://soares-dos-santos.com)
Code Refactoring and project maintainer * [Pascal Deschênes](https://github.com/pdeschen)
- Showdown v1 - Showdown v1
* [Corey Innis](http://github.com/coreyti):<br/> * [Corey Innis](http://github.com/coreyti):<br/>