Permalink
Browse files

Merge branch '025/master'

  • Loading branch information...
jordanallain committed Jun 21, 2018
2 parents ec1d426 + 429e42d commit 656868a6950fdade80f56ed28ffc2f5ea73c3f8c
Showing with 4,526 additions and 2,596 deletions.
  1. +0 −1 .gitignore
  2. +2 −2 README.md
  3. +4,516 −2,583 package-lock.json
  4. +8 −10 package.json
@@ -104,7 +104,6 @@ tmp
dist
vendor.js
specs.js
application.js
_SpecRunner.html
*.woff2
*.woff
@@ -4,7 +4,7 @@

A template for starting lessons with Ember as a client. Build pipeline and development server provided by `ember-cli`. Bootstrap and Sass included.

*Note* This is not a project template.
*Note* This is not a project template.

## Updating Dependencies

@@ -24,7 +24,7 @@ If you have not installed phantomjs, you will need to install it globally:

- [ember.js](http://emberjs.com/)
- [ember-cli](http://www.ember-cli.com/)
- [Bootstrap](http://getbootstrap.com)
- [ember-bootstrap](https://www.ember-bootstrap.com/)

At the beginning of each cohort, update this template by upgrading `ember-cli`
and generating a new Ember application in another location. Copy files over a
Oops, something went wrong.

0 comments on commit 656868a

Please sign in to comment.