Merge branch 'development' into bugfix/sharing-import-to-artemis
# Conflicts: # src/main/java/at/ac/uibk/gitsearch/service/ExerciseService.java
Branches
Showing
- pom.xml 1 addition, 1 deletionpom.xml
- src/main/webapp/app/editorialPages/markDownViewer/markDownViewer.component.html 1 addition, 1 deletion...itorialPages/markDownViewer/markDownViewer.component.html
- src/main/webapp/app/editorialPages/markDownViewer/markDownViewer.component.scss 3 additions, 0 deletions...itorialPages/markDownViewer/markDownViewer.component.scss
- src/main/webapp/app/exercise/exercise-card/exercise-card.component.html 2 additions, 1 deletion...p/app/exercise/exercise-card/exercise-card.component.html
- src/main/webapp/app/layouts/footer/footer.component.html 22 additions, 13 deletionssrc/main/webapp/app/layouts/footer/footer.component.html
Please register or sign in to comment