Skip to content
Commit 1541575b authored by Kristián Feldsam's avatar Kristián Feldsam
Browse files

Merge branch 'release/1.0.2' into develop



Signed-off-by: default avatarKristián Feldsam <feldsam@gmail.com>

# Conflicts:
#	CHANGELOG
parents e5efd536 ac80e14f
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