summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Tamlyn <marc.tamlyn@gmail.com>2015-06-06 09:10:20 +0100
committerMarc Tamlyn <marc.tamlyn@gmail.com>2015-06-06 09:10:20 +0100
commit74f430f093956c22e61ba33b032bb5f355d43ff0 (patch)
tree6f055eaf8ec1b1c730802894001e0af19a1db5e1
parent0a899157836cc4c3d3980ab6a70b2f37bbb7ba97 (diff)
parent8957b1682c11e8b642ac6ddfaf302bb52173a0f4 (diff)
Merge pull request #4820 from alimony/patch-1
Added Markus Amalthea Magnuson to AUTHORS.
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 73cf6441da..b207968d1d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -443,6 +443,7 @@ answer newbie questions, and generally made Django that much better:
mark@junklight.com
Mark Lavin <markdlavin@gmail.com>
Mark Sandstrom <mark@deliciouslynerdy.com>
+ Markus Amalthea Magnuson <markus.magnuson@gmail.com>
Markus Holtermann <https://markusholtermann.eu>
Marten Kenbeek <marten.knbk+django@gmail.com>
martin.glueck@gmail.com