branch: externals/ivy-avy
commit b72ed4864a9378d93bbd58c9cba03f679f5bcb00
Merge: 1b63a8f5c2 6227843101
Author: Basil L. Contovounesios <ba...@contovou.net>
Commit: Basil L. Contovounesios <ba...@contovou.net>
Merge branch 'master' into externals/ivy-avy
---
.mailmap | 2 ++
ivy-avy.el | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index 1a00c174ba..eb78d6ffb0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,8 @@
<ricouillet...@gmail.com> <ad...@ericdanan.net>
<ricouillet...@gmail.com> <eric.da...@u-cergy.fr>
<syo...@gmail.com> <shohei.yosh...@dena.com>
+<ywwr...@gmail.com> <58066925+ywwr...@users.noreply.github.com>
+Christopher Floess <chris.flo...@mailbox.org>
Daanturo <daant...@gmail.com> <dantle....@gmail.com>
Diego A. Mundo <diegoamu...@gmail.com>
Earl Hyatt <oka...@protonmail.com> <ej...@protonmail.com>
diff --git a/ivy-avy.el b/ivy-avy.el
index aed1f541d1..0d320afdbf 100644
--- a/ivy-avy.el
+++ b/ivy-avy.el
@@ -1,6 +1,6 @@
;;; ivy-avy.el --- Avy integration for Ivy -*- lexical-binding: t -*-
-;; Copyright (C) 2020-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2020-2025 Free Software Foundation, Inc.
;; Author: Oleh Krehel <ohwoeo...@gmail.com>
;; Maintainer: Basil L. Contovounesios <ba...@contovou.net>
