Skip to content

Commit

Permalink
Merge branch 'v0.10.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
hax committed Jul 17, 2015
2 parents 9e3f233 + dfc85b5 commit fb96411
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/ometa-js
Submodule ometa-js updated 2 files
+0 −1 .gitattributes
+1 −97 index.js
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jedi",
"version": "0.9.27",
"version": "0.10.0",
"author": "Hax <johnhax@gmail.com>",
"description": "jedi -- a language for Web",
"keywords": [
Expand All @@ -15,9 +15,11 @@
"dependencies": {
"babel-runtime": "^5.6.20",
"commander": "*",
"debug": "^2.2.0",
"es6-shim": "^0.32.2",
"mmclass": "*",
"my": "*"
"my": "*",
"tabish": "*"
},
"devDependencies": {
"babel": "^5.6.14",
Expand Down

0 comments on commit fb96411

Please sign in to comment.