Skip to content
Commit 5fbf98b8 authored by Scharkee's avatar Scharkee
Browse files

Merge branch 'multiple-filetypes' into 'master' 

Multiple filetypes

See merge request !20
parents b4f11b81 dfa4a056
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