Skip to content
Snippets Groups Projects
Commit 972f0dfd authored by Giuseppe Digilio's avatar Giuseppe Digilio
Browse files

Merge remote-tracking branch 'remotes/origin/master' into shibboleth 

# Conflicts:
#	resources/i18n/de.json5
#	resources/i18n/en.json5
#	src/app/shared/shared.module.ts
parents eea76746 4b67dbf1
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 35043 additions and 232 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