Merge remote-tracking branch 'upstream/master' into gs-master

2017-10-16 09:23:59 -05:00
parent 6cd5b3bbe5 aec70b44fc
commit dbb1fce94d
67 changed files with 1520 additions and 787 deletions
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@ -1,6 +1,8 @@
 import { start } from 'rails-ujs';
+import 'font-awesome/css/font-awesome.css';

 // import common styling
 require('../styles/common.scss');
+require.context('../images/', true);

 start();