summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2011-09-08 11:27:42 +0200
committerMichael Hamann <michael@content-space.de>2011-09-08 11:39:00 +0200
commitfb46ebd87eb43d5cd9f67f353f6656d0e3a0b196 (patch)
treeb89b580659168d8550dcca66fb0c303389b77aaf /data
parentaea34b5fe445064477d8ad0c98926db33a0d0851 (diff)
parentcc2c0b9d6af82732ed79eeb85c22b7c3192a4e55 (diff)
downloadrpg-fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196.tar.gz
rpg-fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196.tar.bz2
Merge branch 'media-revisions'
This introduces a new media manager and media revisions to DokuWiki. The changes have been implemented by Kate Arzamastseva and are the result of a Google Summer of Code project, the official project page can be found at http://www.google-melange.com/gsoc/project/google/gsoc2011/kate/18001 Thanks to Kate for the work and Google for sponsoring it!
Diffstat (limited to 'data')
-rw-r--r--data/media_attic/_dummy0
-rw-r--r--data/media_meta/_dummy0
2 files changed, 0 insertions, 0 deletions
diff --git a/data/media_attic/_dummy b/data/media_attic/_dummy
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/media_attic/_dummy
diff --git a/data/media_meta/_dummy b/data/media_meta/_dummy
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/media_meta/_dummy