Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revisions
Showing
- inc/FeedParser.php 1 addition, 1 deletioninc/FeedParser.php
- inc/mail.php 3 additions, 0 deletionsinc/mail.php
- lib/scripts/behaviour.js 3 additions, 4 deletionslib/scripts/behaviour.js
- lib/scripts/media.js 3 additions, 3 deletionslib/scripts/media.js
- lib/styles/all.css 1 addition, 0 deletionslib/styles/all.css
- lib/tpl/index.php 1 addition, 1 deletionlib/tpl/index.php
Loading
Please register or sign in to comment