Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

autorensystem
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

bc9c252e

Commit bc9c252e authored 9 years ago by Helena Jank

Downloads
- Plain Diff

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

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

index.html 29 additions, 14 deletions

index.html
js/authoring/controllers/modalWindows/newScenarioModalWindowController.js 6 additions, 6 deletions

...trollers/modalWindows/newScenarioModalWindowController.js
js/authoring/controllers/tabs/contextTabController.js 61 additions, 40 deletions

js/authoring/controllers/tabs/contextTabController.js

with 96 additions and 60 deletions

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 sign in to comment