Skip to content

Commit

Permalink
Merge branch 'hotfix-v3.12.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
taija committed Apr 23, 2018
2 parents 6b716aa + c3c938b commit 6b2170d
Show file tree
Hide file tree
Showing 5 changed files with 227 additions and 91 deletions.
4 changes: 2 additions & 2 deletions g/3/c/g.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions g/3/h/bfoot.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ <h3 class="url fn"><a href="https://www.bellevuecollege.edu/" title="Bellevue Co
<span class="locality">Bellevue</span>,
<span class="region">WA</span>
<span class="postal-code">98007-6406</span>
<span class="country">USA</span>
</div>
</div><!--#bellevueaddress -->

Expand Down
309 changes: 222 additions & 87 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"gulp-modernizr": "^1.0.0",
"gulp-notify": "^3.2.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "~3.1.0",
"gulp-sass": "^3.2.1",
"gulp-sourcemaps": "^2.6.4",
"gulp-uglify": "^2.0.1",
"napa": "^2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion sass/g.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Globals Version 3.12 */
/*! Globals Version 3.12.1 */

@import "partials/base";

Expand Down

0 comments on commit 6b2170d

Please sign in to comment.