summaryrefslogtreecommitdiff
path: root/THANKS
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2010-01-23 15:29:33 +0000
committerJan Lehnardt <jan@apache.org>2010-01-23 15:29:33 +0000
commit5a87b852a72cc36d4d7b64271ed542ce2a1befe0 (patch)
tree0b2a694cedc6edb3b0fe7f783f4f894d18b15467 /THANKS
parentf4033185bbd88d827dfc47bd58cdbfd5ec0e8866 (diff)
show conflicts in changes filters. Patch by Lena Herrmann. Closes COUCHDB-630
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@902422 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'THANKS')
-rw-r--r--THANKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/THANKS b/THANKS
index 83f47153..8d307650 100644
--- a/THANKS
+++ b/THANKS
@@ -42,5 +42,6 @@ suggesting improvements or submitting changes. Some of these people are:
* Matthew Hooker <mwhooker@gmail.com>
* Filipe Manana <fdmanana@gmail.com>
* Ilia Cheishvili <ilia.cheishvili@gmail.com>
+ * Lena Herrmann <lena@zeromail.org>
For a list of authors see the `AUTHORS` file.