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
1 merge request!13Manifest side to side
Showing
with 81 additions and 92 deletions
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment