Skip to content
Snippets Groups Projects
Commit ccce462b authored by Volkor Barbarian Warrior's avatar Volkor Barbarian Warrior
Browse files

Merge branch '1.2.0' into 'master'

Merge 1.2.0

Closes #6 and #7

See merge request !2
parents 3a1cccca 67a77100
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment