Skip to content

Commit 4e2166c

Browse files
committed
Merge pull request #561 from Martii/someDepUpdates
Some dep updates Auto-merge
2 parents fe564f3 + f24117b commit 4e2166c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"express": "4.11.1",
1717
"express-minify": "0.1.2",
1818
"express-session": "1.10.1",
19-
"font-awesome": "4.2.0",
19+
"font-awesome": "4.3.0",
2020
"formidable": "1.0.16",
2121
"github": "0.2.3",
2222
"highlight.js": "8.4.0",
@@ -25,7 +25,7 @@
2525
"marked": "0.3.3",
2626
"method-override": "2.3.1",
2727
"moment": "2.9.0",
28-
"mongoose": "3.8.21",
28+
"mongoose": "3.8.22",
2929
"morgan": "1.5.1",
3030
"mu2": "0.5.20",
3131
"octicons": "git://github.com/github/octicons.git#835ee02",
@@ -48,8 +48,8 @@
4848
"passport-windowslive": "1.0.1",
4949
"passport-yahoo": "0.3.0",
5050
"request": "2.51.0",
51-
"sanitize-html": "1.5.1",
52-
"select2": "3.5.1",
51+
"sanitize-html": "1.5.2",
52+
"select2": "3.5.2-browserify",
5353
"select2-bootstrap-css": "1.4.4",
5454
"serve-favicon": "2.2.0",
5555
"underscore": "1.7.0"

routesStatic.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ module.exports = function (aApp) {
6363
'fonts/fontawesome-webfont.svg': { maxage: day * 7 },
6464
'fonts/fontawesome-webfont.ttf': { maxage: day * 7 },
6565
'fonts/fontawesome-webfont.woff': { maxage: day * 7 },
66+
'fonts/fontawesome-webfont.woff2': { maxage: day * 7 },
6667
'fonts/FontAwesome.otf': { maxage: day * 7 }
6768
});
6869

0 commit comments

Comments
 (0)