Merge branch 'master' into gh-pages

This commit is contained in:
John Shaver 2017-07-20 16:10:56 -07:00
commit 86e52917b6

View file

@ -7,7 +7,7 @@ const ScoutView = ScoutOverviewCont(ScoutOverview);
class App extends Component { class App extends Component {
render() { render() {
const scoutID = getQueryParamByName("id", this.props.slug); const scoutID = getQueryParamByName("id", this.props.query);
return ( return (
<div className="App"> <div className="App">