diff options
| author | jmaud <maudlin.johnathan@gmail.com> | 2014-10-15 11:34:50 -0400 |
|---|---|---|
| committer | jmaud <maudlin.johnathan@gmail.com> | 2014-10-15 11:34:50 -0400 |
| commit | fe277959606857f2690b4d6dd224fffc6a550d34 (patch) | |
| tree | 1f4fe866661f06bae6f5fcc702b9450da32e9627 /fr-fr | |
| parent | 54835f209475cf6ace7fcd7fab8140ecedcec340 (diff) | |
| parent | bc6a21835f862a4c8b386fce48aebd2cdd1a5232 (diff) | |
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Merge changes
Diffstat (limited to 'fr-fr')
| -rw-r--r-- | fr-fr/haskell.html.markdown | 2 | ||||
| -rw-r--r-- | fr-fr/lua-fr.html.markdown | 2 | ||||
| -rw-r--r-- | fr-fr/scala.html.markdown | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/fr-fr/haskell.html.markdown b/fr-fr/haskell.html.markdown index 989db1d5..d9d3151f 100644 --- a/fr-fr/haskell.html.markdown +++ b/fr-fr/haskell.html.markdown @@ -1,5 +1,5 @@ --- -language: haskell +language: Haskell contributors: - ["Adit Bhargava", "http://adit.io"] translators: diff --git a/fr-fr/lua-fr.html.markdown b/fr-fr/lua-fr.html.markdown index 922d6ebc..b4e2a161 100644 --- a/fr-fr/lua-fr.html.markdown +++ b/fr-fr/lua-fr.html.markdown @@ -1,5 +1,5 @@ --- -language: lua +language: Lua filename: learnlua-fr.lua contributors: - ["Tyler Neylon", "http://tylerneylon.com/"] 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 --- |