Merge master

2017-07-08 22:30:20 -07:00
parent a7465aaf2e 444c8afb2a
commit b9df4a76d7
58 changed files with 828 additions and 524 deletions
--- a/frontend/scenes/Search/Search.js
+++ b/frontend/scenes/Search/Search.js
@@ -3,7 +3,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { observer } from 'mobx-react';
 import _ from 'lodash';
-import { Flex } from 'reflexbox';
+import Flex from 'components/Flex';
 import { withRouter } from 'react-router';
 import { searchUrl } from 'utils/routeHelpers';
 import styled from 'styled-components';