# Merge remote-tracking branch 'upstream/main' into fix/11402-terminal-cursor-fringe · pingdotgg/t3code

[View on GitCafe](https://git.cafe/pingdotgg/t3code/commit/2a5ca7fae59e7ad59caaceb32822f72d7d16a608)

Repository: [pingdotgg/t3code](https://git.cafe/pingdotgg/t3code)

Visibility: public

Requested revision: 2a5ca7fae59e7ad59caaceb32822f72d7d16a608

Requested commit: 2a5ca7fae59e7ad59caaceb32822f72d7d16a608

Commit: 2a5ca7fae59e7ad59caaceb32822f72d7d16a608

Tree: e03723e74a12975ebe702dfdf6af520dbc7bca41

Author: Nick T\.

Committer: Nick T\.

## Message

```
Merge remote-tracking branch 'upstream/main' into fix/11402-terminal-cursor-fringe

# Conflicts:
#	apps/web/src/terminal/ghostty/renderer.test.ts

```

## Parents

- [cd667ddf81bc1db9567399c7ad427206ff685060](https://git.cafe/pingdotgg/t3code/commit/cd667ddf81bc1db9567399c7ad427206ff685060?format=markdown)

- [e64766c56ac6fc1678e6107052feb0047a35337f](https://git.cafe/pingdotgg/t3code/commit/e64766c56ac6fc1678e6107052feb0047a35337f?format=markdown)

[Source at this commit](https://git.cafe/pingdotgg/t3code/tree/2a5ca7fae59e7ad59caaceb32822f72d7d16a608?format=markdown)