Merge branch 'maint'
This commit is contained in:
commit
d07d7c29c5
|
@ -1,5 +1,5 @@
|
||||||
;;; org-crypt.el --- Public Key Encryption for Org Entries -*- lexical-binding: t; -*-
|
;;; org-crypt.el --- Public Key Encryption for Org Entries -*- lexical-binding: t; -*-
|
||||||
;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
|
;; Copyright (C) 2007-2017 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Emacs Lisp Archive Entry
|
;; Emacs Lisp Archive Entry
|
||||||
;; Filename: org-crypt.el
|
;; Filename: org-crypt.el
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;;; ox-publish.el --- Publish Related Org Mode Files as a Website -*- lexical-binding: t; -*-
|
;;; ox-publish.el --- Publish Related Org Mode Files as a Website -*- lexical-binding: t; -*-
|
||||||
;; Copyright (C) 2006-2016 Free Software Foundation, Inc.
|
;; Copyright (C) 2006-2017 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: David O'Toole <dto@gnu.org>
|
;; Author: David O'Toole <dto@gnu.org>
|
||||||
;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
|
;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
|
||||||
|
|
Loading…
Reference in New Issue