From: Alex Schroeder <alex@gnu.org>
Date: Mon, 28 Jun 2021 05:49:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/patch_better_evil_bindings' into main
X-Git-Tag: bookmarks~31
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=commitdiff_plain;h=770de5d967e8517b13d3865482cdda7078f6a3ba

Merge remote-tracking branch 'upstream/patch_better_evil_bindings' into main
---

770de5d967e8517b13d3865482cdda7078f6a3ba
diff --cc elpher.el
index 66fa275,2ca7520..c2c24a8
--- a/elpher.el
+++ b/elpher.el
@@@ -1,19 -1,6 +1,21 @@@
  ;;; elpher.el --- A friendly gopher and gemini client  -*- lexical-binding:t -*-
  
 -;; Copyright (C) 2019-2020 Tim Vaughan
 +;; Copyright (C) 2021 Jens Östlund <jostlund@gmail.com>
 +;; Copyright (C) 2021 F. Jason Park <jp@neverwas.me>
 +;; Copyright (C) 2021 Christopher Brannon <chris@the-brannons.com>
 +;; Copyright (C) 2021 Omar Polo <op@omarpolo.com>
 +;; Copyright (C) 2021 Noodles! <nnoodle@chiru.no>
 +;; Copyright (C) 2020-2021 Alex Schroeder <alex@gnu.org>
++;; Copyright (C) 2020 Zhiwei Chen <chenzhiwei03@kuaishou.com>
++;; Copyright (C) 2020 condy0919 <condy0919@gmail.com>
 +;; Copyright (C) 2020 Alexis <flexibeast@gmail.com>
 +;; Copyright (C) 2020 Étienne Deparis <etienne@depar.is>
 +;; Copyright (C) 2020 Simon Nicolussi <sinic@sinic.name>
 +;; Copyright (C) 2020 Michel Alexandre Salim <michel@michel-slm.name>
 +;; Copyright (C) 2020 Koushk Roy <kroy@twilio.com>
 +;; Copyright (C) 2020 Vee <vee@vnsf.xyz>
 +;; Copyright (C) 2020 Simon South <simon@simonsouth.net>
 +;; Copyright (C) 2019-2020 Tim Vaughan <plugd@thelambdalab.xyz>
  
  ;; Author: Tim Vaughan <plugd@thelambdalab.xyz>
  ;; Created: 11 April 2019