Merge remote-tracking branch 'origin/master' into fr-xml

This commit is contained in:
Geoffrey Liu 2014-10-12 13:43:22 -07:00
commit 73cfde72b0

View File

@ -1,12 +1,11 @@
---
language: Scala
filename: learnscala.scala
contributors:
- ["George Petrov", "http://github.com/petrovg"]
- ["Dominic Bou-Samra", "http://dbousamra.github.com"]
translators:
- ["Anne-Catherine Dehier", "https://github.com/spellart"]
filename: learn.scala
- ["Anne-Catherine Dehier", "https://github.com/spellart"]
filename: learnscala-fr.scala
lang: fr-fr
---