Skip to content
Snippets Groups Projects
Commit 5c39aa6c authored by Benedikt Wetzel's avatar Benedikt Wetzel
Browse files

merge upstream master

parents 7448d5ae c04b712f
No related branches found
No related tags found
1 merge request!171Introduce ResourceSets to make loading of resource files more flexible
Showing
with 109 additions and 52 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