diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 18:33:39 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 18:33:39 +0900 |
| commit | 886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28 (patch) | |
| tree | b5770d9fc10a704ad8aeb3474c6940121252c770 /lisp/erc/erc-services.el | |
| parent | 015a6e1df2772bd43680df5cbeaffccf98a881da (diff) | |
| parent | 8dc00b2f1e6523c634df3e24379afbe712a32b27 (diff) | |
| download | emacs-886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28.tar.gz | |
Merge branch 'master' into harfbuzz
Diffstat (limited to 'lisp/erc/erc-services.el')
| -rw-r--r-- | lisp/erc/erc-services.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index ac49a3e12ef..886ba60eb47 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -1,6 +1,6 @@ ;;; erc-services.el --- Identify to NickServ -*- lexical-binding:t -*- -;; Copyright (C) 2002-2004, 2006-2018 Free Software Foundation, Inc. +;; Copyright (C) 2002-2004, 2006-2019 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org |