Merge master (rebase being super annoying). Fix conflicts

This commit is contained in:
Chris McCuller
2015-09-21 22:19:15 -04:00
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*

View File

@ -1,5 +1,5 @@
# Ember ClI
# visit http://www.ember-cli.com/ to view user guid
# Ember CLI
# Visit http://www.ember-cli.com/ to view user guide
alias es='ember serve'
alias ea='ember addon'
@ -8,9 +8,6 @@ alias ed='ember destroy'
alias eg='ember generate'
alias eh='ember help'
alias ein='ember init'
alias eia='ember install:addon'
alias eib='ember install:bower'
alias ein='ember install:npm'
alias ei='ember install'
alias et='ember test'
alias eu='ember update'