Skip to content

Commit 94acaaf

Browse files
committed
Merge branch 'develop'
2 parents 9ec5be8 + 02af4b3 commit 94acaaf

File tree

128 files changed

+93768
-4253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+93768
-4253
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
node_modules
22
TODO
33
.node-xmlhttprequest-sync-*
4+
demo/dist/
5+
demo/.embark/development/
6+
demo/config/production/password
7+
boilerplate/dist/

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
language: node_js
2+
node_js:
3+
- "6"
4+
- "5"
5+
- "4"

Gruntfile.coffee

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ module.exports = (grunt) ->
2121
mochaTest:
2222
test:
2323
src: ['test/**/*.js']
24+
jshint:
25+
all: ['bin/embark', 'lib/**/*.js', 'js/mine.js', 'js/embark.js']
2426

2527
grunt.loadTasks "tasks"
2628
require('matchdep').filterAll(['grunt-*','!grunt-cli']).forEach(grunt.loadNpmTasks)

0 commit comments

Comments
 (0)