Skip to content
Snippets Groups Projects
Commit bc9c252e authored by Helena Jank's avatar Helena Jank
Browse files

Merge branch 'master' of https://github.com/hjank/autorensystem

Conflicts:
	index.html
	js/authoring/controllers/tabs/contextTabController.js
parents c0e9666e 64ef18ee
No related branches found
No related tags found
No related merge requests found
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