summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-08-15 04:47:53 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-08-15 04:47:53 -0400
commitd221c840fc25b06c4dc0ebe50b94a1d93e1442ad (patch)
treec033b7c7def68fa70a530c38b9222137746ed166
parenta9b85525c4af71154b47408425e7d78acab574e1 (diff)
parent656af0fe465134e3feadf448b02053075bbd2e1c (diff)
downloadaskbot-d221c840fc25b06c4dc0ebe50b94a1d93e1442ad.tar.gz
askbot-d221c840fc25b06c4dc0ebe50b94a1d93e1442ad.tar.bz2
askbot-d221c840fc25b06c4dc0ebe50b94a1d93e1442ad.zip
Merge branch 'github'
-rw-r--r--askbot/doc/source/contributors.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst
index 04a93e40..5e97b608 100644
--- a/askbot/doc/source/contributors.rst
+++ b/askbot/doc/source/contributors.rst
@@ -48,7 +48,7 @@ Programming, bug fixes and documentation
* `Zafer Cakmak <https://github.com/xaph>`_
* `Kevin Porterfield <http://www.shotgunsoftware.com>_`
* `Robert Martin <https://github.com/bobbydavid>_`
-* `pcompassion https://github.com/pcompassion`_
+* `Director <http://codeflow.co.kr>`_
Translations
------------