Merge branch 'master' of https://github.com/hjank/autorensystem
Conflicts: index.html js/authoring/controllers/tabs/contextTabController.js
No related branches found
No related tags found
Showing
- index.html 29 additions, 14 deletionsindex.html
- js/authoring/controllers/modalWindows/newScenarioModalWindowController.js 6 additions, 6 deletions...trollers/modalWindows/newScenarioModalWindowController.js
- js/authoring/controllers/tabs/contextTabController.js 61 additions, 40 deletionsjs/authoring/controllers/tabs/contextTabController.js
Loading
Please register or sign in to comment