Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
authorlain <lain@soykaf.club>
Mon, 17 Dec 2018 20:19:00 +0000 (21:19 +0100)
committerlain <lain@soykaf.club>
Mon, 17 Dec 2018 20:19:00 +0000 (21:19 +0100)
commiteb2d34eb6cc3257a260994b7b144a80dd254602c
tree374acdbd774e443b71d1f8b97a9bdd0f2b428d1d
parent3e1816fcd5b5b109ba51c5a4f021a1851893c131
parent3d980daa49e51c7e3ec1f019e2b68c8108b37c76
Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend