Skip to content
Commit f4890a97 authored by lavado's avatar lavado
Browse files

Merge branch 'hackfest9' into 'hackfest9' 

Add charms in magma

See merge request !8
parents 50ac5a1b 39fb1c2c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment