Skip to content
Snippets Groups Projects
Commit cd9d2861 authored by Steffen Michels's avatar Steffen Michels
Browse files

Merge branch 'master' into '142-more-combinators-for-building-editors' 

# Conflicts:
#   Libraries/iTasks/Extensions/User.icl
parents d0b2b00c c51fefbd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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