]> Shamusworld >> Repos - ardour-manual-diverged/commit
Merge branch 'no_jekyll' of https://github.com/skagedal/manual into no_jekyll
authorSimon Kågedal Reimer <skagedal@gmail.com>
Wed, 11 Mar 2015 21:03:43 +0000 (22:03 +0100)
committerSimon Kågedal Reimer <skagedal@gmail.com>
Wed, 11 Mar 2015 21:03:43 +0000 (22:03 +0100)
commitf188aabf74da7925e36bc8fb8e22221b197f4bf6
tree8854bfd46066f99163ad2f1d7c0c97d57593d26a
parent935ee4599f9c291e6467ff251a9542652807b8ca
parentae0d367775ab5c30d137f89cb62902d1dccecdf2
Merge branch 'no_jekyll' of https://github.com/skagedal/manual into no_jekyll

Conflicts:
build.rb
build.rb