Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'v1.4.0' into prop-types
  • Loading branch information
prescottprue authored May 5, 2017
commit 18b485d801123d2e271dc609503b46f4c5efeb78
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"firebase": "^3.7.5",
"hoist-non-react-statics": "^1.2.0",
"immutable": "^3.8.1",
"jwt-decode": "^2.1.0",
"jwt-decode": "^2.2.0",
"lodash": "^4.17.4",
"prop-types": "^15.5.8"
},
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.