Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
mmcdermott committed Jun 1, 2016
2 parents a8f3f2b + b5e805c commit fa1f5cc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion src/components/spaces/canvas/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Metric from 'gComponents/metrics/card/index'
import {denormalizedSpaceSelector} from '../denormalized-space-selector'

import {addMetric, changeMetric, removeMetrics} from 'gModules/metrics/actions'
import * as copiedActions from 'gModules/copied/actions'
import {changeSelect, deSelect} from 'gModules/selected_cell/actions'
import {selectRegion, deSelectRegion} from 'gModules/selected_region/actions'
import {runSimulations, deleteSimulations} from 'gModules/simulations/actions'
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ var wistia = `<script charSet="ISO-8859-1" src="//fast.wistia.com/assets/externa
var twitter = `<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>`
var fonts = `<link href='https://fonts.googleapis.com/css?family=Lato:400,700,300' rel='stylesheet' type='text/css'>`
var chargebee = `<script type="text/javascript" src="https://js.chargebee.com/v1/chargebee.js"></script>`
var escapedFragments = `<meta name="fragment" content="!">`

var head = elev + wistia + twitter + fonts + chargebee
var head = elev + wistia + twitter + fonts + chargebee + escapedFragments

var meta = {name: name, content: description}

Expand Down

0 comments on commit fa1f5cc

Please sign in to comment.