Merge remote-tracking branch 'origin/gh-pages' into gh-pages

# Conflicts:
#	package.json
This commit is contained in:
ido 2015-12-29 13:00:20 +02:00
commit b20f455fbe
1 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
{
"name": "react-templates",
"version": "0.5.0",
"version": "0.4.0",
"description": "Light weight templates for react -> write html get valid react code",
"main": "./dist/cli.js",
"bin": {