Skip to content
Snippets Groups Projects
Commit aac8e649 authored by Axel's avatar Axel
Browse files

Merge branch 'development_master' into development_master_refactoring_1

# Conflicts:
#	gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld.orig
parents 45f4c5f0 ac83c711
No related branches found
No related tags found
No related merge requests found
Showing
with 395 additions and 83 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment