summaryrefslogtreecommitdiffhomepage
path: root/fr-fr
diff options
context:
space:
mode:
authorZachary Ferguson <zfergus2@users.noreply.github.com>2015-10-07 23:46:13 -0400
committerZachary Ferguson <zfergus2@users.noreply.github.com>2015-10-07 23:46:13 -0400
commitbc212592497b8e6277ba27a1c81a55eee3ad4c23 (patch)
tree54b9600f90ab7643cf67cc839ee1fb253788d695 /fr-fr
parente1ac6209a8d3f43e7a018d79454fb1095b3314c0 (diff)
parentabd7444f9e5343f597b561a69297122142881fc8 (diff)
Merge remote-tracking branch 'adambard/master'
Conflicts: java.html.markdown
Diffstat (limited to 'fr-fr')
-rw-r--r--fr-fr/php.html.markdown3
1 files changed, 3 insertions, 0 deletions
diff --git a/fr-fr/php.html.markdown b/fr-fr/php.html.markdown
index 1c8db89a..f4eaf396 100644
--- a/fr-fr/php.html.markdown
+++ b/fr-fr/php.html.markdown
@@ -1,5 +1,8 @@
---
language: PHP
+contributors:
+ - ["Malcolm Fell", "http://emarref.net/"]
+ - ["Trismegiste", "https://github.com/Trismegiste"]
translators:
- ["Pascal Boutin", "http://pboutin.net/"]
lang: fr-fr