|
483b0ae730
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/checklists/panels/AnswerDialogPanel.java
src/main/java/se/su/dsv/scipro/checklists/panels/ChecklistQuestionPanel.java
src/main/java/se/su/dsv/scipro/project/panels/NewIdeaWatsonCompletionPanel.java
|
2013-09-18 16:19:48 +02:00 |
|