Skip to content
Snippets Groups Projects
Commit 5fed86a4 authored by Dan Notestein's avatar Dan Notestein
Browse files

Merge branch 'develop' into 'master'

finally merge old fixes with master

See merge request !9
parents e4ac227c 4b11cc55
No related branches found
No related tags found
1 merge request!9finally merge old fixes with master
Showing with 265 additions and 103 deletions
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