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 /lib/_fla | |
| 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 'lib/_fla')
| -rw-r--r-- | lib/_fla/.htaccess | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/_fla/.htaccess b/lib/_fla/.htaccess index 9a7d38c12..055d099c7 100644 --- a/lib/_fla/.htaccess +++ b/lib/_fla/.htaccess @@ -1,3 +1,4 @@ ## no access to the fla directory order allow,deny deny from all +Satisfy All |