Skip to content
Commit 5b4c69c4 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Merge pull request #294 from discos/master 

Fix #287, updated CONTRIBUTING.md with the correct merging strategy.(#293)
parents 1ad5425f 3711620e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment