Hide .describe_location on push and popstate

[rails.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index e317d8bfe3ed6f3c25ded49ec46cdbd8f5784661..c576a560fbb160af75b4765a82cc7b427cc1a837 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,8 @@
 Andrzej Zaborowski <balrogg@gmail.com> <andrew.zaborowski@intel.com>
-Andy Allan <andy@gravitystorm.co.uk> <gravitystorm@gmail.com>
+Andy Allan <andy@gravitystorm.co.uk> <gravitystorm@gmail.com> <github@gravitystorm.co.uk>
+Florian Schäfer <florian@schaeferban.de>
 Grant Slater <openstreetmap@firefishy.com> <github@firefishy.com>
-Harry Wood <git@harrywood.co.uk> <mail@harrywood.co.uk>
+Harry Wood <git@harrywood.co.uk> <mail@harrywood.co.uk> <github@onlineanimals.co.uk>
 Kai Krueger <kakrueger@gmail.com> <kai@aiputerlx.(none)>
+Michael Glanznig <nebulon42@yandex.com>
 Richard Fairhurst <richard@systemeD.net> <richard@systemed.net>