diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
| commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
| tree | c8d0f78c2f47f373473419396d3c0855ec671eca /conf/msg | |
| parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
| parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
| download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'conf/msg')
| -rw-r--r-- | conf/msg | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/conf/msg b/conf/msg deleted file mode 100644 index 38bbb133c..000000000 --- a/conf/msg +++ /dev/null @@ -1,8 +0,0 @@ -25 -The first line of this file contains a number, indicating -which notification messages should not be displayed. This -is the only information sent to dokuwiki.org when the -updatecheck option is enabled. You usually don't need to -change this number as it gets updated when you install the -new release - but to ignore a certain message set its -number here. |