Skip to content
Snippets Groups Projects
Commit f0be19d5 authored by Anthony's avatar Anthony
Browse files

Merge branch 'annotation-on-video' into 17-8-open-an-other-manifest-side-by-side-from-an-annotation 

# Conflicts:
#	package.json
parents b0223b70 a9b9b6d1
Branches
Tags
Hide whitespace changes
Inline Side-by-side
Showing
with 271 additions and 58 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment