[PR #54] [MERGED] chore: sync goon with main and dev for beta release #71

New issue

Closed

opened 2026-03-03 15:57:37 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 15:57:37 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/mrgoonie/winshot/pull/54
Author: @mrgoonie
Created: 12/24/2025
Status: ✅ Merged
Merged: 12/24/2025
Merged by: @mrgoonie

Base: dev ← Head: goon

📝 Commits (4)

26f7754 Merge pull request #51 from mrgoonie/dev
8d3e86a chore(release): 1.3.0 [skip ci]
2ddc6d5 Merge remote-tracking branch 'origin/main' into goon
66d6850 chore: merge origin/dev with conflict resolution

📊 Changes

1 file changed (+1 additions, -1 deletions)

View changed files

📝 CHANGELOG.md (+1 -1)

📄 Description

Summary

Merged origin/main into goon branch
Merged origin/dev into goon branch with conflict resolution
Ready for beta release to dev branch

Changes

Synced CHANGELOG.md with both branches
Included tapered arrow feature from dev

Test plan

Verify CI passes
Confirm changelog is properly formatted

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/mrgoonie/winshot/pull/54 **Author:** [@mrgoonie](https://github.com/mrgoonie) **Created:** 12/24/2025 **Status:** ✅ Merged **Merged:** 12/24/2025 **Merged by:** [@mrgoonie](https://github.com/mrgoonie) **Base:** `dev` ← **Head:** `goon` --- ### 📝 Commits (4) - [`26f7754`](https://github.com/mrgoonie/winshot/commit/26f77541d180217219fc52a55fcf5a86e01dc722) Merge pull request #51 from mrgoonie/dev - [`8d3e86a`](https://github.com/mrgoonie/winshot/commit/8d3e86a1760768f2ee16f4d0dbcbd66f1ca71234) chore(release): 1.3.0 [skip ci] - [`2ddc6d5`](https://github.com/mrgoonie/winshot/commit/2ddc6d5c35ab1a03b8c67312ffde680c3a47c12a) Merge remote-tracking branch 'origin/main' into goon - [`66d6850`](https://github.com/mrgoonie/winshot/commit/66d68504d400659321f8e5f45bfe52fe29333d9b) chore: merge origin/dev with conflict resolution ### 📊 Changes **1 file changed** (+1 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `CHANGELOG.md` (+1 -1) </details> ### 📄 Description ## Summary - Merged origin/main into goon branch - Merged origin/dev into goon branch with conflict resolution - Ready for beta release to dev branch ## Changes - Synced CHANGELOG.md with both branches - Included tapered arrow feature from dev ## Test plan - [ ] Verify CI passes - [ ] Confirm changelog is properly formatted --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>