Conflicts: IkiWiki/Plugin/git.pm debian/changelog po/ikiwiki.pot |
||
---|---|---|
.. | ||
Plugin | ||
Setup | ||
CGI.pm | ||
Render.pm | ||
Setup.pm | ||
UserInfo.pm | ||
Wrapper.pm |
Conflicts: IkiWiki/Plugin/git.pm debian/changelog po/ikiwiki.pot |
||
---|---|---|
.. | ||
Plugin | ||
Setup | ||
CGI.pm | ||
Render.pm | ||
Setup.pm | ||
UserInfo.pm | ||
Wrapper.pm |