Merge branch 'development' of...
Merge branch 'development' of https://github.com/University-of-Potsdam-MM/contactJS into development Conflicts: js/modules/discoverer/translation.js
No related branches found
No related tags found
Showing
- build/contactJS.js 1 addition, 1 deletionbuild/contactJS.js
- dist/contactJS.js 64 additions, 45 deletionsdist/contactJS.js
- js/modules/aggregator/aggregator.js 0 additions, 11 deletionsjs/modules/aggregator/aggregator.js
- js/modules/discoverer/discoverer.js 0 additions, 9 deletionsjs/modules/discoverer/discoverer.js
- js/modules/discoverer/translation.js 38 additions, 42 deletionsjs/modules/discoverer/translation.js
- js/modules/interpreter/interpreter.js 0 additions, 10 deletionsjs/modules/interpreter/interpreter.js
- js/modules/widget/widget.js 0 additions, 13 deletionsjs/modules/widget/widget.js
- qunitTest/aggregatorTest.js 51 additions, 54 deletionsqunitTest/aggregatorTest.js
- qunitTest/discovererTest.js 8 additions, 8 deletionsqunitTest/discovererTest.js
- qunitTest/interpreterTest.js 2 additions, 2 deletionsqunitTest/interpreterTest.js
- qunitTest/widgetTest.js 2 additions, 2 deletionsqunitTest/widgetTest.js
Loading
Please register or sign in to comment