diff options
| author | varac <varacanero@zeromail.org> | 2014-01-31 17:19:46 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-01-31 17:19:46 +0100 |
| commit | 37e3c260f026a66b37f54cd6092ee2c28d262247 (patch) | |
| tree | f1bca78de1e368b97332356928710257fe3c6a42 /.mailmap | |
| parent | e94ae94dd01cd256f89fb079cfca75a487dceed5 (diff) | |
| parent | ca1c07ad510ec24037b9fd4baad1a57b26eabedc (diff) | |
Merge branch 'develop' into 0.6
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..aee70b0a --- /dev/null +++ b/.mailmap @@ -0,0 +1,8 @@ +Varac <varacanero@zeromail.org> +Micah Anderson <micah@leap.se> Micah Anderson <micah@riseup.net> +Micah Anderson <micah@leap.se> micah <micah@leap.se> +Kwadronaut <kwadronaut@leap.se> +Elijah <elijah@riseup.net> elijah <elijah@ChrUbuntu.(none)> +Elijah <elijah@riseup.net> elijah <elijah@riseup.net> +Leap Admins <admin@leap.se> root <root@localhost> + |