Permalink
Browse files

Merge pull request #268 from koenbok/package-and-ignore

Moving all dependencies into package.json "dependencies", and adding …
  • Loading branch information...
koenbok committed Dec 14, 2015
2 parents 982a065 + 8144c17 commit 672b250408bad6abf0d43a3b9188983a90e76e10
Showing with 11 additions and 3 deletions.
  1. +8 −0 .gitignore
  2. +3 −3 package.json
@@ -16,6 +16,14 @@ extras/Studio.framer/imported
extras/Studio.framer/app.js
test/phantomjs/tests.js
test/phantomjs/tests.js.map
framer/**/*.js
framer/**/*.js.map
test/tests/**/*.js
test/tests/**/*.js.map
extras/Perf.framer/**/*.js
extras/Perf.framer/**/*.js.map
gulpfile.js
gulpfile.js.map
# Discard version changes
framer/Version.coffee
@@ -15,12 +15,12 @@
"url": "https://github.com/koenbok/Framer.git"
},
"dependencies": {
},
"devDependencies": {
"eventemitter3": "^1.1.1",
"gulp-util": "^3.0.7",
"husl": "^6.0.1",
"lodash": "^3.5.0"
},
"devDependencies": {
"lodash": "^3.5.0",
"async": "^1.5.0",
"bower": "^1.3.12",
"coffee-coverage": "^0.7.0",

0 comments on commit 672b250

Please sign in to comment.