summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2014-03-12 18:39:11 +0000
committerChristopher Smith <chris@jalakai.co.uk>2014-03-12 18:39:11 +0000
commit4e60057c8ccbee18b94a64208311f9bbb338eec6 (patch)
tree08d79159aa78693c27f54ecebc3105034dfc5933 /README
parent57a6f99d09d3662a8a2ad72e312aa6f53bcc2d01 (diff)
parent069942acdaa5ba825bc3f92c7093b5071789f1ca (diff)
downloadrpg-4e60057c8ccbee18b94a64208311f9bbb338eec6.tar.gz
rpg-4e60057c8ccbee18b94a64208311f9bbb338eec6.tar.bz2
Merge branch 'master' into tablethead
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