Skip to content

Commit

Permalink
Merge branch 'release/v2.3.1'
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
joeworkman committed Jul 23, 2020
2 parents 4edd1f0 + f0b4cb0 commit 7da0709
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 295 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sass.compiler = require('node-sass');
supercollider
.config({
template: foundationDocs.componentTemplate,
marked: foundationDocs.marked,
marked: foundationDocs.marked.mdRenderer,
handlebars: foundationDocs.handlebars,
keepFm: true,
quiet: false,
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foundation-emails",
"version": "2.3.0",
"version": "2.3.1",
"description": "A framework for responsive emails",
"keywords": [
"responsive",
Expand All @@ -25,7 +25,7 @@
"cheerio": "^1.0.0-rc.3",
"clipboard-js": "^0.3.6",
"cssnano": "^4.1.10",
"foundation-docs": "foundation/foundation-docs",
"foundation-docs": "foundation/foundation-docs#master",
"foundation-sites": "foundation/foundation-sites#master",
"gulp": "^4.0.2",
"gulp-autoprefixer": "^7.0.1",
Expand All @@ -46,19 +46,19 @@
"gulp-sourcemaps": "^2.6.5",
"gulp-wrap": "^0.15.0",
"gulp-zip": "^5.0.1",
"inky": "foundation/inky#master",
"inky": "^1.4.1",
"js-yaml": "^3.14.0",
"lazypipe": "^1.0.1",
"marked": "^1.1.1",
"motion-ui": "^2.0.3",
"multiline": "^2.0.0",
"node-sass": "^4.14.1",
"octophant": "^1.0.0",
"panini": "foundation/panini#master",
"panini": "^1.7.1",
"rimraf": "^3.0.0",
"run-sequence": "^2.2.1",
"siphon-media-query": "^1.0.0",
"supercollider": "foundation/supercollider#master",
"supercollider": "^1.5.2",
"typeahead.js": "^0.11.1",
"yargs": "^14.2.0",
"zeroclipboard": "^2.2.0",
Expand Down
Loading

0 comments on commit 7da0709

Please sign in to comment.