diff options
| author | Guy Brand <gb@unistra.fr> | 2013-05-10 14:35:28 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-05-10 14:35:28 +0200 |
| commit | 83f133d10eda8c1c6b6429c08b2d0722ca88ca17 (patch) | |
| tree | 0377662d2335a0e2160175d5be3b95a92f6bb332 /data | |
| parent | bc250e0ee2ec4fba891b53aa4f1814ce648ac71a (diff) | |
| parent | 2a5a1456564635ddbca06edbc902e7f820d2a97b (diff) | |
| download | rpg-83f133d10eda8c1c6b6429c08b2d0722ca88ca17.tar.gz rpg-83f133d10eda8c1c6b6429c08b2d0722ca88ca17.tar.bz2 | |
Merge branch master into stable
Diffstat (limited to 'data')
| -rw-r--r-- | data/.htaccess | 1 | ||||
| -rw-r--r-- | data/deleted.files | 3 | ||||
| -rw-r--r-- | data/pages/wiki/dokuwiki.txt | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/data/.htaccess b/data/.htaccess index 2cbb757e7..281d5c33d 100644 --- a/data/.htaccess +++ b/data/.htaccess @@ -1,3 +1,2 @@ order allow,deny deny from all -Satisfy All diff --git a/data/deleted.files b/data/deleted.files index 4b9657da2..664086c25 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 2013-05-10 +lib/plugins/info/lang/sl/lang.php + # removed in 2013-04-06 inc/adLDAP.php inc/auth/ad.class.php diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt index e6fac5b65..2db4dbef3 100644 --- a/data/pages/wiki/dokuwiki.txt +++ b/data/pages/wiki/dokuwiki.txt @@ -57,7 +57,7 @@ All documentation and additional information besides the [[syntax|syntax descrip ===== Copyright ===== -2004-2010 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community +2004-2013 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-). |