-
Jussi Lindgren authored
Merge branch 'wip-jlindgre-merge-neuroelectrics-enobio' of git+ssh://scm.gforge.inria.fr//gitroot/openvibe/openvibe into integration_0.18 Conflicts: scripts/win32-install_dependencies.exe
30f9400c
[A venir] Mise en place de quotas sur nos instances gitlab. Pour plus d'information lire: https://doc-si.inria.fr/pages/viewpage.action?pageId=129728565
Merge branch 'wip-jlindgre-merge-neuroelectrics-enobio' of git+ssh://scm.gforge.inria.fr//gitroot/openvibe/openvibe into integration_0.18 Conflicts: scripts/win32-install_dependencies.exe