Skip to content
Snippets Groups Projects
Commit fe92da8c authored by Manuela Kuhn's avatar Manuela Kuhn
Browse files

Merge branch 'hotfix-2.1.3' into develop 

Conflicts:
	src/sender/dataFetchers/getFromFile.py
parents 6684e2f0 583e4bc9
No related branches found
No related tags 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