Skip to content
Snippets Groups Projects
Commit 1564eeee authored by Gervaise Henry's avatar Gervaise Henry :cowboy:
Browse files

Merge branch 'update_20120219' into 'develop' 

Update 20120219

Closes #6 and #2

See merge request !29
parents 8fcca0af 72404407
2 merge requests!30Develop,!29Update 20120219
Pipeline #6058 passed with stages
in 20 seconds
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