• Merge remote-tracking branch 'upstream/feature/side-navigation' into … 

    …feature/side-navigation
    @IAmThePan
    IAmThePan committed Aug 31, 2018
    Loading status checks…
    58938a4