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

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

Merge remote-tracking branch 'origin/development' into 

111-easy-access-to-readme-md-and-potentially-other-files

Conflicts:
	package-lock.json
	src/main/webapp/app/search/search.module.ts
parents 4c1c2457 38ec943f
1 merge request!38Resolve "Easy Access to ReadMe.md (and potentially other files)"
Hide whitespace changes
Inline Side-by-side
Showing
with 402 additions and 323 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