Merge branch 'develop' into automatic_scoring
authorLaurent Mazet <mazet@softndesign.org>
Sun, 22 Nov 2020 11:19:36 +0000 (12:19 +0100)
committerLaurent Mazet <mazet@softndesign.org>
Sun, 22 Nov 2020 11:19:36 +0000 (12:19 +0100)
commite9a1a3aa04c097908f012e2b177dd7634e559340
tree5d144a048532095348d06c0ef5cbe6d999ffcf1a
parent540e5e89204743e25d7e0fd5780895abca5e42d7
parent66c3d65f2b7d5e315a431ae1912c1e3cfb6314b5
Merge branch 'develop' into automatic_scoring
public/config.js.sample
public/trivabble.js