Code

Merge branch 'jn/gitweb-side-by-side-diff'