diff options
| author | Geoffrey Liu <liug.2012@gmail.com> | 2014-10-12 13:43:22 -0700 |
|---|---|---|
| committer | Geoffrey Liu <liug.2012@gmail.com> | 2014-10-12 13:43:22 -0700 |
| commit | 73cfde72b0fc4f7c21d6725dfaf04e29be3d7504 (patch) | |
| tree | bdb0b7845c86665327769a6196d3f1065052c83f | |
| parent | e2913890cbc9d79d7840cead6157ff8e0f3216f9 (diff) | |
| parent | 4feb1f380a4e86b36a4ba6b6541ee6137ce1c52f (diff) | |
Merge remote-tracking branch 'origin/master' into fr-xml
| -rw-r--r-- | fr-fr/scala.html.markdown | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fr-fr/scala.html.markdown b/fr-fr/scala.html.markdown index da562138..a43edf16 100644 --- a/fr-fr/scala.html.markdown +++ b/fr-fr/scala.html.markdown @@ -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 --- |