Merge branch 'master' into ember-cli
Conflicts: assets/scripts/travis.coffee
This commit is contained in:
commit
eab311737a
|
@ -20,6 +20,7 @@ configKeysMap = {
|
||||||
julia: 'Julia'
|
julia: 'Julia'
|
||||||
csharp: 'C#'
|
csharp: 'C#'
|
||||||
dart: 'Dart'
|
dart: 'Dart'
|
||||||
|
elixir: 'Elixir'
|
||||||
}
|
}
|
||||||
|
|
||||||
`export default configKeysMap`
|
`export default configKeysMap`
|
||||||
|
|
Loading…
Reference in New Issue
Block a user