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

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

Merge remote-tracking branch 'origin/feature/#51-import-from-artemis'

into development and additional clean up

Conflicts:
	src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java
	src/main/webapp/app/app-routing.module.ts
	src/main/webapp/app/exercise/service/exercise.service.ts
	src/main/webapp/app/search/search-input/search-input.component.ts
	src/main/webapp/app/shared/model/exercise.model.ts
parents f52770de 6d369146
Branches
Showing
with 30770 additions and 70 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