Merge branch 'master' into jori/cache

This commit is contained in:
Jori Lallo
2017-07-16 19:49:50 -07:00
committed by GitHub
10 changed files with 84 additions and 111 deletions

View File

@ -28,7 +28,6 @@ import Starred from 'scenes/Starred';
import Collection from 'scenes/Collection';
import Document from 'scenes/Document';
import Search from 'scenes/Search';
import Settings from 'scenes/Settings';
import SlackAuth from 'scenes/SlackAuth';
import Flatpage from 'scenes/Flatpage';
import ErrorAuth from 'scenes/ErrorAuth';
@ -126,7 +125,7 @@ render(
<Route exact path="/search" component={Search} />
<Route exact path="/search/:query" component={Search} />
<Route exact path="/settings" component={Settings} />
<Route exact path="/developers" component={Api} />
<Route path="/404" component={Error404} />
@ -140,9 +139,6 @@ render(
path="/collections/:id/new"
component={DocumentNew}
/>
<Route exact path="/developers" component={Api} />
<Route component={notFoundSearch} />
</Switch>
</Layout>