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

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

Merge branch 'development' into feature/#51-import-from-artemis 

# Conflicts:
#	package.json
#	src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java
#	src/main/java/at/ac/uibk/gitsearch/web/rest/ExerciseResource.java
#	src/main/webapp/app/bookmarks/bookmarks.component.ts
#	src/main/webapp/app/core/core.module.ts
#	src/main/webapp/app/exercise/service/exercise.service.ts
#	src/main/webapp/app/search/search.component.ts
parents 730f4010 c3a6ca25
2 merge requests!62created achievementService and separated some functionality out of...,!61Feature/#51 import from artemis
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1373 additions and 1085 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