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

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

Merge branch 'integrate_oer_into_sharing' into development 

Conflicts:
	package-lock.json
	src/main/webapp/app/layouts/navbar/navbar.component.ts
	src/test/javascript/jest.ts
	src/test/javascript/spec/app/teaserContent/teaserContent.component.spec.ts
	yarn.lock
parents 5a134948 b4e93ae0
Branches
Hide whitespace changes
Inline Side-by-side
Showing
with 70 additions and 17 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