Merge branch 'master' of github.com:outline/outline into zapier

This commit is contained in:
Tom Moor
2018-09-30 17:37:35 -07:00
3 changed files with 8 additions and 8 deletions

View File

@ -67,15 +67,15 @@ export default function Routes() {
path={`/doc/${slug}/history/:revisionId?`}
component={Document}
/>
<Route path={`/doc/${slug}`} component={Document} />
<Route exact path="/search" component={Search} />
<Route exact path="/search/:query" component={Search} />
<Route path="/404" component={Error404} />
<RouteSidebarHidden
exact
path={`/doc/${slug}/edit`}
component={Document}
/>
<Route path={`/doc/${slug}`} component={Document} />
<Route exact path="/search" component={Search} />
<Route exact path="/search/:query" component={Search} />
<Route path="/404" component={Error404} />
<RouteSidebarHidden
exact
path="/collections/:id/new"