Skip to content
Commit 30e3b0e7 authored by Richard Hartmann's avatar Richard Hartmann
Browse files

Merge pull request #89 from alerque/master 

Add hooks to allow fancy merge handling
parents 890dbded bca2d01e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment