close
[ikiwiki] / doc / forum / Your_local_changes_to_the_following_files_would_be_overwritten_by_merge: /
2014-09-15  Simon McVittieMerge branch 'ready/templatebody'
2014-09-15  Simon McVittieMerge branch 'ready/document-success-reason'
2014-09-12  Simon McVittieMerge branch 'ready/imgforpdf-and-more'
2014-09-12  Simon McVittieMerge branch 'ready/chrysn/linkmapenhancement'
2014-09-12  Simon McVittieMerge branch 'ready/perf'
2014-09-12  Simon McVittieMerge branch 'ready/more-proxy-utf8-fail'
2014-09-12  Simon McVittieMerge remote-tracking branch 'spalax/paternal/upload...
2014-09-12  Simon McVittieikiwiki (3.20140916) unstable; urgency=low
2014-05-26  http://bob-bernste... Added a comment: Fat Fingers
2014-05-26  http://bob-bernste... Added a comment: FIXED! YIPPEE!