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

Skip to content
Snippets Groups Projects
Commit 819c727e authored by Daniel Crazzolara's avatar Daniel Crazzolara
Browse files

Merge branch 'development' into improvement/adapt-import-to-new-artemis-export

# Conflicts:
#	src/main/java/at/ac/uibk/gitsearch/es/model/ArtemisExerciseInfo.java
#	src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java
#	src/main/webapp/app/exercise/import/exercise-import.component.html
#	src/main/webapp/app/exercise/import/exercise-import.component.ts
#	src/main/webapp/app/shared/model/artemis-exercise-info.model.ts
#	src/main/webapp/app/shared/model/exercise.model.ts
parents e282d129 e7b5cc50
Branches
Showing
with 1926 additions and 30097 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