Skip to content
Snippets Groups Projects
Commit e518992c authored by Gandalf's avatar Gandalf
Browse files

Merge branch 'develop' into 'autoclave' 

# Conflicts:
#   README.md
parents c04f736d e4ac227c
No related branches found
No related tags found
2 merge requests!9finally merge old fixes with master,!6cleanup merge
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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