summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.org>2016-02-07 06:36:12 -0500
committerKenneth Reitz <me@kennethreitz.org>2016-02-07 06:36:12 -0500
commitd90358bf6991ec19a4c6a07173f9127e970d96fb (patch)
tree7e76962d170635d1073360cc8bbb65b7d94686ff /AUTHORS
parentc5920249ded38dc5fe70f22021f4a0dd73dd97cf (diff)
parent5fbdd56fba67b259a2bee7979b20fbbd9a31dc63 (diff)
downloadtablib-d90358bf6991ec19a4c6a07173f9127e970d96fb.tar.gz
Merge branch 'develop' of https://github.com/rabinnankhwa/tablib into develop
# Conflicts: # AUTHORS
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 7d150db..7f14eb1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,5 +29,6 @@ Patches and Suggestions
- Alex Gaynor
- James Douglass
- Tommy Anthony
+- Rabin Nankhwa
- Marco Dallagiacoma
- Mathias Loesch