Skip to content
Snippets Groups Projects
Commit e1d5f1fb authored by hjank's avatar hjank
Browse files

Merge branch 'master' of https://github.com/University-of-Potsdam-MM/autorensystem 

Conflicts:
	js/authoring/controllers/modalWindows/deleteScenarioModalWindowController.js
parents 425f01f7 bc9cc89e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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