diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
| commit | 8ccf9c9785ec2b626bad30a88a21f02886845418 (patch) | |
| tree | 0ecd6103880e3350bd37ba11ae3872805ede1755 /data | |
| parent | e2092379b1c3200832cb569781ec647db5aeef0f (diff) | |
| parent | 23d27376b2a2f6a1ccf0777c48435717494d85b1 (diff) | |
| download | rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.gz rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
data/deleted.files
doku.php
lib/exe/xmlrpc.php
Diffstat (limited to 'data')
| -rw-r--r-- | data/.htaccess | 1 | ||||
| -rw-r--r-- | data/deleted.files | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/data/.htaccess b/data/.htaccess index 281d5c33d..2cbb757e7 100644 --- a/data/.htaccess +++ b/data/.htaccess @@ -1,2 +1,3 @@ order allow,deny deny from all +Satisfy All diff --git a/data/deleted.files b/data/deleted.files index 4d6f31dbf..e154ce179 100644 --- a/data/deleted.files +++ b/data/deleted.files @@ -4,6 +4,9 @@ # A copy of this list is maintained at # http://www.dokuwiki.org/install:upgrade#files_to_remove +# removed in rc2011-04-22 +conf/words.aspell.dist +lib/styles/style.css # removed in 2010-11-07 inc/lang/ar/subscribermail.txt |