Merge branch 'master' into story/150636425

This commit is contained in:
Wyatt Johnson
2017-09-15 09:57:57 -06:00
committed by GitHub
3 changed files with 6 additions and 1 deletions
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import t from 'coral-framework/services/i18n';
import {join} from 'path';
import join from 'url-join';
import styles from './Configure.css';
import {Button, Card} from 'coral-ui';
import {BASE_URL} from 'coral-framework/constants/url';