Commit 8852cf87 authored by Sebastian Seufert's avatar Sebastian Seufert
Browse files

Merge branch 'master' of https://gitlab.rz.uni-bamberg.de/cogsys/dare2del/demonstrator.git

# Conflicts:
#	web_api.pl
parents 82093523 a274287f
Supports Markdown
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