summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 68cc9bb..8e4a87c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,7 @@
George Brocklehurst <george@thoughtbot.com> <george.brocklehurst@gmail.com>
George Brocklehurst <george@thoughtbot.com> <george@georgebrock.com>
Javier López <linux.kitten@gmail.com> <kitten@openbsdbox>
+Melissa Xie <melissa@thoughtbot.com> <me@melissaxie.com>
Mike Burns <mburns@thoughtbot.com> <mike@mike-burns.com>
Pablo Olmos de Aguilera Corradini <pablo@glatelier.org>
Patrick Brisbin <pat@thoughtbot.com> <pbrisbin@gmail.com>