Skip to content

Commit d225599

Browse files
bigtigerbigtiger
authored
Merge pull request #56 from adorableio/develop
Release: 20170730a
2 parents 5a5dde6 + 8384bc5 commit d225599

Some content is hidden

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

79 files changed

+5855
-707
lines changed

‎.babelrc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"presets": [
3+
["env", {
4+
"targets": {
5+
"node": "0.10"
6+
},
7+
"useBuiltIns": true
8+
}]
9+
],
10+
"plugins": [
11+
"transform-regenerator",
12+
"transform-object-rest-spread"
13+
],
14+
"ignore": [
15+
"node_modules/",
16+
]
17+
}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ node_modules/
22
bower_components/
33
.generated/
44
.env
5+
newrelic_agent.log

‎.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.10.1

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "0.10"
3+
- "7"
44
before_install:
55
- sudo apt-get update
66
- sudo apt-get install imagemagick graphicsmagick

‎Gulpfile.js

Lines changed: 0 additions & 204 deletions
This file was deleted.

‎Procfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: coffee app.coffee
1+
web: npm run start:prod

‎app.coffee

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎app/css/main.styl

Whitespace-only changes.

‎app/index.html

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎app/js/app.coffee

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)