diff options
author | Kenneth Reitz <me@kennethreitz.org> | 2016-02-07 06:36:12 -0500 |
---|---|---|
committer | Kenneth Reitz <me@kennethreitz.org> | 2016-02-07 06:36:12 -0500 |
commit | d90358bf6991ec19a4c6a07173f9127e970d96fb (patch) | |
tree | 7e76962d170635d1073360cc8bbb65b7d94686ff /AUTHORS | |
parent | c5920249ded38dc5fe70f22021f4a0dd73dd97cf (diff) | |
parent | 5fbdd56fba67b259a2bee7979b20fbbd9a31dc63 (diff) | |
download | tablib-d90358bf6991ec19a4c6a07173f9127e970d96fb.tar.gz |
Merge branch 'develop' of https://github.com/rabinnankhwa/tablib into develop
# Conflicts:
# AUTHORS
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -29,5 +29,6 @@ Patches and Suggestions - Alex Gaynor - James Douglass - Tommy Anthony +- Rabin Nankhwa - Marco Dallagiacoma - Mathias Loesch |