Merge branch 'master' into feature/cnn
authorPaul Brossier <piem@piem.org>
Mon, 31 Dec 2018 20:48:19 +0000 (21:48 +0100)
committerPaul Brossier <piem@piem.org>
Mon, 31 Dec 2018 20:48:19 +0000 (21:48 +0100)
commitd0ef4b7f97434666595dcfb02effc0ebaee2c87f
tree24ea5f46fde4c0020582cd3090e6e6dab165ae61
parent9bad2bab46b71d14cde7057a0c20f96ce6748b80
parentdc7362fd01ba34189e434f396729ff0c12c36e50
Merge branch 'master' into feature/cnn