Skip to content
Snippets Groups Projects
Commit e1033801 authored by Matyáš Latner's avatar Matyáš Latner
Browse files

Merge branch 'devel' into 'master'

Devel

See merge request !22
parents 07e359e4 227849a7
Branches master
Tags 1.0.4
No related merge requests found
Showing
with 139 additions and 134 deletions
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