summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-01-01 11:19:47 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-01-01 11:19:47 +0100
commitd07d7c29c5eff753c7e821903760985859ed15d3 (patch)
tree5742e1bd0cde023d5b7571156399d81bf7114a55
parent87b0b0dca6549a1ede938d923660c45d804c83d2 (diff)
parent336bab6ea7b4ad8055ca5b82734c0956e8704080 (diff)
downloadorg-mode-d07d7c29c5eff753c7e821903760985859ed15d3.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-crypt.el2
-rw-r--r--lisp/ox-publish.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el
index 412aeaf..4439c94 100644
--- a/lisp/org-crypt.el
+++ b/lisp/org-crypt.el
@@ -1,5 +1,5 @@
;;; 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
;; Filename: org-crypt.el
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index a7a9596..17437ba 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -1,5 +1,5 @@
;;; 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>
;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>