Merge branch 'release/beta-10' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 7 Aug 2018 14:12:31 +0000 (16:12 +0200)
committerChocobozzz <me@florianbigard.com>
Tue, 7 Aug 2018 14:12:31 +0000 (16:12 +0200)
commit9a12f169c15b638fe78cf6e85a1993550a25e404
treeee3efd50738036f899e17f56620dccbe2e39739b
parent3d52b300ea79bec21f090e2447c4808307078618
parent59549436ef0e97351c22fd20d135e1a0b3a5a966
Merge branch 'release/beta-10' into develop
client/package.json
package.json