Skip to content
Commit 5bdf0c1d authored by Nathan Chambron's avatar Nathan Chambron
Browse files

Merge branch 'develop' into 'master' 

Put spec file into MASTER

See merge request !8
parents aaf42956 29f887a0
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