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

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

Merge branch 'jhipster_update_2022_02' of 

https://sharing-codeability.uibk.ac.at/sharing/codeability-sharing-platform.git
into jhipster_update_2022_02

Conflicts:
	src/main/webapp/app/exercise/exercise-card/exercise-card.component.ts
	src/main/webapp/app/exercise/import/exercise-import.component.html
	src/main/webapp/app/exercise/import/exercise-import.module.ts
parents 153c73ef a5a3f729
Branches
2 merge requests!91Bringing JHipster7.6.0 to production,!88Integrating Update to JHipster 7.6.0 back to Development
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 366 additions and 260 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