Skip to content
This repository has been archived by the owner on Mar 16, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into new-style
Browse files Browse the repository at this point in the history
  • Loading branch information
jseppi committed May 19, 2016
2 parents 16a4c8a + 82b5d70 commit d6e4819
Show file tree
Hide file tree
Showing 7 changed files with 270 additions and 240 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -12,7 +12,7 @@
"body-parser": "^1.14.1",
"bower": "^1.7.2",
"ejs": "^2.4.1",
"express": ">= 0.0.0",
"express": "^4.13.4",
"express-session": "^1.11.3",
"github": "^0.2.4",
"method-override": "^2.3.5",
Expand Down

0 comments on commit d6e4819

Please sign in to comment.