development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-08-28 12:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'releases/2.5.4' into fix-accidental-merge-of-2.5.5-release

Browse source
This commit is contained in:
Markus Olsson 2020-09-09 16:01:01 +02:00
parent 3ee11301e4 99879be59f
commit 679141e658
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/package.json
View file

@ -3,7 +3,7 @@
"productName": "GitHub Desktop",
"bundleID": "com.github.GitHubClient",
"companyName": "GitHub, Inc.",
"version": "2.5.5-beta1",
"version": "2.5.5",
"main": "./main.js",
"repository": {
"type": "git",

4
changelog.json
View file

@ -1,5 +1,9 @@
{
"releases": {
"2.5.5": [
"[Fixed] Don't update submodules when discarding files - #10469",
"[Fixed] Clicking on a branch in the compare branch list resets focus to the filter text box - #10485"
],
"2.5.5-beta1": [
"[Added] Show status of GitHub Action runs for pull requests - #9819. Thanks @Raul6469!",
"[Added] Add AspNet and Diff/Patch Syntax Highlights - #10410. Thanks @say25!",