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

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

Merge branch 'master' back to 'development' 

# Conflicts:
#   src/main/java/at/ac/uibk/gitsearch/service/AuthorityService.java
#   src/main/resources/config/application-prod.yml
parents 1f094cde 24c1c148
2 merge requests!203Just trivial merge back from master to development,!194Merge Master Bugfix back to Development
Hide whitespace changes
Inline Side-by-side
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