summaryrefslogtreecommitdiffhomepage
path: root/ru-ru/php-ru.html.markdown
diff options
context:
space:
mode:
authorLevi Bostian <levi.bostian@banno.com>2013-11-25 09:42:37 -0600
committerLevi Bostian <levi.bostian@banno.com>2013-11-25 09:42:37 -0600
commitaf6701904b459b16cf65709cd8c70fd2f5519457 (patch)
tree68cb4bf9ead32686f492e68528e9f0761e41c500 /ru-ru/php-ru.html.markdown
parentdf3cc00f5233dac96c0e063d87d3552f493e25f6 (diff)
parentd24c824d388669181eed99c3e94bb25c2914304a (diff)
Fix conflict bash.
Diffstat (limited to 'ru-ru/php-ru.html.markdown')
-rw-r--r--ru-ru/php-ru.html.markdown1
1 files changed, 1 insertions, 0 deletions
diff --git a/ru-ru/php-ru.html.markdown b/ru-ru/php-ru.html.markdown
index 9133ecca..edcac4dd 100644
--- a/ru-ru/php-ru.html.markdown
+++ b/ru-ru/php-ru.html.markdown
@@ -3,6 +3,7 @@ language: php
contributors:
- ["Malcolm Fell", "http://emarref.net/"]
- ["Trismegiste", "https://github.com/Trismegiste"]
+translators:
- ["SlaF", "https://github.com/SlaF"]
lang: ru-ru
filename: learnphp-ru.php