Merge master (rebase being super annoying). Fix conflicts

This commit is contained in:
Chris McCuller 2015-09-21 22:19:15 -04:00
commit e6ccd37b05
112 changed files with 6857 additions and 1042 deletions

View file

@ -1,8 +1,8 @@
# Ember-cli
# Ember CLI
**Maintainer:**[BilalBudhani](http://www.github.com/BilalBudhani)
**Maintainers:** [BilalBudhani](http://www.github.com/BilalBudhani), [eubenesa](http://www.github.com/eubenesa)
Ember-cli (http://www.ember-cli.com/)
Ember CLI (http://www.ember-cli.com/)
### List of Aliases
@ -15,9 +15,6 @@ Alias | Ember-CLI command
**eg** | *ember generate*
**eh** | *ember help*
**ein** | *ember init*
**eia** | *ember install:addon*
**eib** | *ember install:bower*
**ein** | *ember install:npm*
**ei** | *ember install*
**et** | *ember test*
**eu** | *ember update*