summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-02-15 15:10:15 +0100
committerGerrit Uitslag <klapinklapin@gmail.com>2014-02-15 15:10:15 +0100
commit2643fc174cfce2c89b096e1aa28b8433c1bd9088 (patch)
tree4219fa16c1e196fca55429092494051eb899891c /README
parent1da8dc976a4e9184fe550789a77d8e5cb866926f (diff)
parent0ba750c06b51626ccace39f0f6be7062eebb0a40 (diff)
downloadrpg-2643fc174cfce2c89b096e1aa28b8433c1bd9088.tar.gz
rpg-2643fc174cfce2c89b096e1aa28b8433c1bd9088.tar.bz2
Merge remote-tracking branch 'origin/master' into diff_navigation
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 1 insertions, 1 deletions
diff --git a/README b/README
index 3b7cb8a9c..35de49ab1 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ at http://www.dokuwiki.org/
For Installation Instructions see
http://www.dokuwiki.org/install
-DokuWiki - 2004-2013 (c) Andreas Gohr <andi@splitbrain.org>
+DokuWiki - 2004-2014 (c) Andreas Gohr <andi@splitbrain.org>
and the DokuWiki Community
See COPYING and file headers for license info