Skip to content

Commit

Permalink
Merge branch 'master' into changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
joshaber committed May 11, 2017
2 parents c8981bf + 3cf5232 commit 62699d3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "GitHub Desktop",
"bundleID": "com.github.GitHubClient",
"companyName": "GitHub, Inc.",
"version": "0.0.39",
"version": "0.5.0",
"main": "./main.js",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion changelog.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"releases": {
"0.0.40": [
"0.5.0": [
"[Added] Menu item for showing the app logs - #1349",
"[Fixed] Don't let the two-factor authentication dialog be submitted while it's empty - #1386",
"[Fixed] Undo Commit showing the wrong commit - #1373",
Expand Down

0 comments on commit 62699d3

Please sign in to comment.