Merge branch 'development' into 'make_landing_page_responsive_after_jhipster_update' (1c96011f) · Commits · development / sharing / codeAbility Sharing Platform

Commit 1c96011f authored 2 years ago by

Michael Breu

Merge branch 'development' into 'make_landing_page_responsive_after_jhipster_update'

# Conflicts:
#   src/main/webapp/app/editorialPages/pages.component.html
#   src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
#   src/main/webapp/app/home/home.component.html
#   src/main/webapp/app/layouts/footer/footer.component.html
#   src/main/webapp/app/layouts/main/main.component.html
#   src/main/webapp/app/teaserContent/teaserContent.component.html

parents 45f8f14a a4fe6667

Branches

2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 675 additions and 601 deletions

Please register or to comment