1
0
Fork 0
mirror of https://github.com/Oreolek/raconteur.git synced 2024-05-17 00:08:16 +03:00

Merge branch 'master' into stable

Conflicts:
	package.json
This commit is contained in:
Bruno Dias 2015-04-13 00:34:17 -03:00
commit 4762b9b7b6

View file

@ -7,7 +7,10 @@
"name": "Bruno Dias"
},
"files": [
"lib"
"lib/elements.js",
"lib/oneOf.js",
"lib/qualities.js",
"lib/situation.js"
],
"dependencies": {
"jquery": "~2.1.3",
@ -33,5 +36,8 @@
"vinyl-source-stream": "~1.1.0",
"watchify": "^3.1.0"
},
"browserify": {
"transform": ["babelify"]
},
"private": true
}