diff options
| author | Bastien Guerry <bzg@altern.org> | 2014-01-07 14:19:03 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2014-01-07 14:19:03 +0100 |
| commit | ba0220a317aea3f43cc66ca7fb24730f0c503e8a (patch) | |
| tree | 3b44b82e82dec40a03f77665165e6f46786bb62f /lisp/ox-confluence.el | |
| parent | 89b3a2c8badf7f260cdbbe21796dbb4dcf2d5f05 (diff) | |
| parent | 55e4e315a6824d54010331c38594ceb9e08db493 (diff) | |
Merge branch 'maint'
Conflicts:
contrib/lisp/org-favtable.el
Diffstat (limited to 'lisp/ox-confluence.el')
| -rw-r--r-- | lisp/ox-confluence.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ox-confluence.el b/lisp/ox-confluence.el index c87c23e..9b96d5f 100644 --- a/lisp/ox-confluence.el +++ b/lisp/ox-confluence.el @@ -1,6 +1,6 @@ ;;; ox-confluence --- Confluence Wiki Back-End for Org Export Engine -;; Copyright (C) 2012 Sébastien Delafond +;; Copyright (C) 2012, 2014 Sébastien Delafond ;; Author: Sébastien Delafond <sdelafond@gmail.com> ;; Keywords: outlines, confluence, wiki |