Merge branch 'master' into ember-cli

Conflicts: assets/scripts/travis.coffee
2015-02-05 18:21:51 +01:00 · 2015-02-05 18:21:51 +01:00 · eab311737a
commit eab311737a
parent f53f9947a5 42021bb11a
1 changed files with 1 additions and 0 deletions
--- a/app/utils/keys-map.coffee
+++ b/app/utils/keys-map.coffee
@ -20,6 +20,7 @@ configKeysMap = {
  julia:       'Julia'
  csharp:      'C#'
  dart:        'Dart'
+  elixir:      'Elixir'
 }

 `export default configKeysMap`