Commit f35a1c78 authored by Marc Duez's avatar Marc Duez

Merge branch 'rework_analysis' of...

Merge branch 'rework_analysis' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into rework_analysis

Conflicts:
	browser/js/model.js
parents 330059e0 9d195ef0
Markdown is supported
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