diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-23 22:07:26 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-23 22:07:26 +0100 |
| commit | 8fcb305db0081dacd8e8ad0583da5ecc6c6837dc (patch) | |
| tree | 928fc44fde692835bca9dd304ebcb17cdd710ac8 /feed.php | |
| parent | 4d5954c8d1f8bcc5450f8cf70d8139cf5a1e697d (diff) | |
| parent | 5d873dd4ce31c79403a01ac0e40ff148be282592 (diff) | |
| download | rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.gz rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into diff_navigation
Conflicts:
inc/html.php
Diffstat (limited to 'feed.php')
| -rw-r--r-- | feed.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -182,7 +182,7 @@ function rss_parseOptions() { function rss_buildItems(&$rss, &$data, $opt) { global $conf; global $lang; - /* @var auth_basic $auth */ + /* @var DokuWiki_Auth_Plugin $auth */ global $auth; $eventData = array( |