Merge remote-tracking branch 'upstream/development' into website-updates

2019-02-21 13:45:40 +01:00
parent 3955e2c84a 297f3da5db
commit 7d3d997083
42 changed files with 655 additions and 103 deletions
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -135,7 +135,6 @@ render(
                                <Route path={WebsitePaths.Portal} component={LazyPortal} />
                                <Route path={WebsitePaths.FAQ} component={FAQ as any} />
                                <Route path={WebsitePaths.Wiki} component={Wiki as any} />
-
                                <Route
                                    path={`${WebsitePaths.ZeroExJs}/:version?`}
                                    component={LazyZeroExJSDocumentation}