summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien <bzg@gnu.org>2020-01-26 16:33:29 +0100
committerBastien <bzg@gnu.org>2020-01-26 16:33:29 +0100
commit389875c495d49bd715b7cf0aec0c293b90e65c92 (patch)
tree889a59bd09030e5ce80b9e663746e6fcbd2683db
parent1f52f8c5020c433f02daeef7e5619f1134f4f93a (diff)
parent3399918691984e15a611e87f8ab769e0d266c388 (diff)
downloadorg-mode-389875c495d49bd715b7cf0aec0c293b90e65c92.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-attach.el2
-rw-r--r--lisp/org-list.el1
-rw-r--r--lisp/org-table.el1
3 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index f5c81e0..546b000 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -3,8 +3,8 @@
;; Copyright (C) 2008-2020 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@newartisans.com>
+;; Maintainer: Bastien Guerry <bzg at gnu dot org>
;; Keywords: org data attachment
-
;; This file is part of GNU Emacs.
;;
;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/org-list.el b/lisp/org-list.el
index b614089..7cd8a77 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -4,6 +4,7 @@
;;
;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Bastien Guerry <bzg@gnu.org>
+;; Maintainer: Bastien Guerry <bzg at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: https://orgmode.org
;;
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 4976547..1141ee3 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -3,6 +3,7 @@
;; Copyright (C) 2004-2020 Free Software Foundation, Inc.
;; Author: Carsten Dominik <carsten at orgmode dot org>
+;; Maintainer: Bastien Guerry <bzg at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: https://orgmode.org
;;