[elpa] externals/ivy-hydra 09077cfd98: Merge branch 'master' into externals/ivy-hydra

[Basil L. Contovounesios]

branch: externals/ivy-hydra
commit 09077cfd98338c50e33c5625ae30d27c71bd431c
Merge: 01aab50249 4546ce0ca4
Author: Basil L. Contovounesios <basil@contovou.net>
Commit: Basil L. Contovounesios <basil@contovou.net>

    Merge branch 'master' into externals/ivy-hydra
---
 .mailmap     | 31 +++++++++++++++++++++++++++++++
 ivy-hydra.el |  4 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..1a00c174ba
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,31 @@
+# Keep contents sorted using 'M-x sort-lines'.
+# See 'man 5 gitmailmap' for the file format.
+
+<basil@contovou.net> <contovob@tcd.ie>
+<diegoamundo@gmail.com> <therockmandolinist@users.noreply.github.com>
+<dunni@gnu.org> <scholar42@gmail.com>
+<evgenysw@gmail.com> <evgeni.kolev@uber.com>
+<goncalossantos98@gmail.com> <nox@hartley.localdomain>
+<ingo.lohmar@posteo.net> <i.lohmar@gmail.com>
+<jeanphilippe.bernardy@gmail.com> <jean-philippe.bernardy@tweag.io>
+<leungbk@posteo.net> <bkleung89@gmail.com>
+<leungbk@posteo.net> <leungbk@mailfence.com>
+<me@bcc32.com> <azeng@janestreet.com>
+<me@rgrinberg.com> <rudi.grinberg@gmail.com>
+<me@wilfred.me.uk> <whughes@ahl.com>
+<muir@mnd.rs> <muir.manders@gmail.com>
+<muir@mnd.rs> <muir@retailnext.net>
+<ricouilletaff@gmail.com> <admin@ericdanan.net>
+<ricouilletaff@gmail.com> <eric.danan@u-cergy.fr>
+<syohex@gmail.com> <shohei.yoshida@dena.com>
+Daanturo <daanturo@gmail.com> <dantle.v01@gmail.com>
+Diego A. Mundo <diegoamundo@gmail.com>
+Earl Hyatt <okamsn@protonmail.com> <ej32u@protonmail.com>
+Jonathan Hayase <PythonNut@users.noreply.github.com>
+Justin Burkett <justin@burkett.cc>
+Jérôme M. Berger <jeberger@free.fr>
+Manuel Uberti <manuel.uberti@inventati.org> <manuel@boccaperta.com>
+Mohsin Kaleem <mohkale@kisara.moe> <mohkalsin@gmail.com>
+Nathan Moreau <nathan.moreau@m4x.org>
+Troy Hinckley <t.macman@gmail.com>
+Yevgnen Koh <wherejoystarts@gmail.com>
diff --git a/ivy-hydra.el b/ivy-hydra.el
index 259ad9627d..50d1e08161 100644
--- a/ivy-hydra.el
+++ b/ivy-hydra.el
@@ -1,9 +1,9 @@
 ;;; ivy-hydra.el --- Additional key bindings for Ivy  -*- lexical-binding: t 
-*-
 
-;; Copyright (C) 2015-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2024 Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
-;; Maintainer: Basil L. Contovounesios <contovob@tcd.ie>
+;; Maintainer: Basil L. Contovounesios <basil@contovou.net>
 ;; URL: https://github.com/abo-abo/swiper
 ;; Version: 0.14.2
 ;; Package-Requires: ((emacs "24.5") (ivy "0.14.2") (hydra "0.14.0"))