mirror of
https://github.com/desktop/desktop
synced 2024-09-13 21:31:32 +00:00
Merge branch 'releases/2.5.4' into fix-accidental-merge-of-2.5.5-release
This commit is contained in:
commit
679141e658
|
@ -3,7 +3,7 @@
|
||||||
"productName": "GitHub Desktop",
|
"productName": "GitHub Desktop",
|
||||||
"bundleID": "com.github.GitHubClient",
|
"bundleID": "com.github.GitHubClient",
|
||||||
"companyName": "GitHub, Inc.",
|
"companyName": "GitHub, Inc.",
|
||||||
"version": "2.5.5-beta1",
|
"version": "2.5.5",
|
||||||
"main": "./main.js",
|
"main": "./main.js",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
{
|
{
|
||||||
"releases": {
|
"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": [
|
"2.5.5-beta1": [
|
||||||
"[Added] Show status of GitHub Action runs for pull requests - #9819. Thanks @Raul6469!",
|
"[Added] Show status of GitHub Action runs for pull requests - #9819. Thanks @Raul6469!",
|
||||||
"[Added] Add AspNet and Diff/Patch Syntax Highlights - #10410. Thanks @say25!",
|
"[Added] Add AspNet and Diff/Patch Syntax Highlights - #10410. Thanks @say25!",
|
||||||
|
|
Loading…
Reference in a new issue