Skip to content

Commit 7da0709

Browse files
committed
Merge branch 'release/v2.3.1'
# Conflicts: # yarn.lock
2 parents 4edd1f0 + f0b4cb0 commit 7da0709

File tree

3 files changed

+37
-295
lines changed

3 files changed

+37
-295
lines changed

gulpfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ sass.compiler = require('node-sass');
2323
supercollider
2424
.config({
2525
template: foundationDocs.componentTemplate,
26-
marked: foundationDocs.marked,
26+
marked: foundationDocs.marked.mdRenderer,
2727
handlebars: foundationDocs.handlebars,
2828
keepFm: true,
2929
quiet: false,

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "foundation-emails",
3-
"version": "2.3.0",
3+
"version": "2.3.1",
44
"description": "A framework for responsive emails",
55
"keywords": [
66
"responsive",
@@ -25,7 +25,7 @@
2525
"cheerio": "^1.0.0-rc.3",
2626
"clipboard-js": "^0.3.6",
2727
"cssnano": "^4.1.10",
28-
"foundation-docs": "foundation/foundation-docs",
28+
"foundation-docs": "foundation/foundation-docs#master",
2929
"foundation-sites": "foundation/foundation-sites#master",
3030
"gulp": "^4.0.2",
3131
"gulp-autoprefixer": "^7.0.1",
@@ -46,19 +46,19 @@
4646
"gulp-sourcemaps": "^2.6.5",
4747
"gulp-wrap": "^0.15.0",
4848
"gulp-zip": "^5.0.1",
49-
"inky": "foundation/inky#master",
49+
"inky": "^1.4.1",
5050
"js-yaml": "^3.14.0",
5151
"lazypipe": "^1.0.1",
5252
"marked": "^1.1.1",
5353
"motion-ui": "^2.0.3",
5454
"multiline": "^2.0.0",
5555
"node-sass": "^4.14.1",
5656
"octophant": "^1.0.0",
57-
"panini": "foundation/panini#master",
57+
"panini": "^1.7.1",
5858
"rimraf": "^3.0.0",
5959
"run-sequence": "^2.2.1",
6060
"siphon-media-query": "^1.0.0",
61-
"supercollider": "foundation/supercollider#master",
61+
"supercollider": "^1.5.2",
6262
"typeahead.js": "^0.11.1",
6363
"yargs": "^14.2.0",
6464
"zeroclipboard": "^2.2.0",

0 commit comments

Comments
 (0)