Merge branch 'master' of https://github.com/lupo49/dokuwiki into lupo49-master
tree369db3cbdae7e00b6d20d2828d3f8ad7d68398a4
-rw-r--r-- 350 .gitignore
-rw-r--r-- 1526 .htaccess.dist
-rw-r--r-- 17992 COPYING
-rw-r--r-- 306 README
drwxr-xr-x - _cs
drwxr-xr-x - _test
drwxr-xr-x - bin
drwxr-xr-x - conf
drwxr-xr-x - data
-rw-r--r-- 2288 doku.php
-rw-r--r-- 12842 feed.php
drwxr-xr-x - inc
-rw-r--r-- 182 index.php
-rw-r--r-- 17479 install.php
drwxr-xr-x - lib