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

merge upstream master

parents 45aef13a f7e2b939
No related branches found
No related tags found
1 merge request!171Introduce ResourceSets to make loading of resource files more flexible
Showing
with 250 additions and 107 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment