# Merge branch 'slim/17585' into slim/17586 · pingdotgg/t3code

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

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

Visibility: public

Requested revision: d227f0ee7f260c4691aeaac2c2bd0c1fe40fdba4

Requested commit: d227f0ee7f260c4691aeaac2c2bd0c1fe40fdba4

Commit: d227f0ee7f260c4691aeaac2c2bd0c1fe40fdba4

Tree: 90242a9fcba23e7075939bf7352060aeeaa7e4a8

Author: maria-rcks

Committer: maria-rcks

## Message

```
Merge branch 'slim/17585' into slim/17586

# Conflicts:
#	apps/server/src/updates/UpdateWindow.ts

```

## Parents

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

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

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