Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-01-01 11:19:47 +01:00
commit d07d7c29c5
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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>