StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -7,7 +7,7 @@ before_install:
- '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28' - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28'
- npm install -g npm@latest - npm install -g npm@latest
#travis build speed up #travis build speed up
sudo: false sudo: false
cache: cache:
directories: directories:

4
CREDITS.md
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/>