Merge branch 'feature/design' into develop
authorChocobozzz <florian.bigard@gmail.com>
Mon, 11 Dec 2017 10:06:32 +0000 (11:06 +0100)
committerChocobozzz <florian.bigard@gmail.com>
Mon, 11 Dec 2017 10:06:32 +0000 (11:06 +0100)
commitfada8d75550dc7365f7e18ee1569b9406251d660
treedb9dc01c18693824f83fce5020f4c1f3ae7c0865
parent492fd28167f770d79a430fc57451b5a9e075d8e7
parentc2830fa8f84f61462098bf36add824f89436dfa9
Merge branch 'feature/design' into develop