This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit f8857474 authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

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 cbbe9dc7 c6ebb40b
Branches
1 merge request!105Preparing März Release
Showing
with 675 additions and 601 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment