Skip to content
Snippets Groups Projects
Commit c8968342 authored by Julian Rasch's avatar Julian Rasch
Browse files

Merge branch 'dev' into 'dev' 

# Conflicts:
#   Dockerfile
#   requirements.txt
parents 25c3a1bd 01b677b3
No related branches found
No related tags found
2 merge requests!6Finalized Jupyterlab for the sprint,!1first running version of dash inside of jupyterlab via proxy
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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