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

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

Merge branch 'development' into achievements 

Conflicts:
	src/main/java/at/ac/uibk/gitsearch/web/rest/SearchResource.java
	src/main/webapp/app/account/settings/settings.component.html
	src/main/webapp/app/core/icons/font-awesome-icons.ts
	src/test/java/at/ac/uibk/gitsearch/service/SearchServiceIT.java
parents 53d74bce 8f7de643
2 merge requests!62created achievementService and separated some functionality out of...,!45Achievements
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 560 additions and 458 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