• Daniel Gerhardt's avatar
    Merge branch '2.1' · a1448186
    Daniel Gerhardt authored
    Conflicts:
    	src/main/webapp/app/controller/Questions.js
    	src/main/webapp/app/internationalization.js
    a1448186
Name
Last commit
Last update
lib Loading commit data...
src Loading commit data...
.buildpath Loading commit data...
.editorconfig Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.jscs.json Loading commit data...
.jshintrc Loading commit data...
.travis.yml Loading commit data...
CHANGELOG.md Loading commit data...
CONTRIBUTING.md Loading commit data...
COPYING Loading commit data...
Gruntfile.js Loading commit data...
README.md Loading commit data...
build.xml Loading commit data...
package.json Loading commit data...
pom.xml Loading commit data...
sonar-project.properties Loading commit data...