Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil
Conflicts: browser/css/dark.css browser/css/light.css browser/css/vidjil.less
Showing
Please register or sign in to comment
Conflicts: browser/css/dark.css browser/css/light.css browser/css/vidjil.less