Merge branch 'master' into ember-cli

Conflicts:
	assets/scripts/travis.coffee
This commit is contained in:
Piotr Sarnacki 2015-02-05 18:21:51 +01:00
commit eab311737a

View File

@ -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`