# Merge remote-tracking branch 'origin/main' into t3/share-dialog-people · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/b4fac486980d19ead1e7325b8c331ff4caa97908)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: b4fac486980d19ead1e7325b8c331ff4caa97908

Requested commit: b4fac486980d19ead1e7325b8c331ff4caa97908

Commit: b4fac486980d19ead1e7325b8c331ff4caa97908

Tree: 90a8a8090e8b822ff6261fbdc8e14416b54e5da0

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Merge remote-tracking branch 'origin/main' into t3/share-dialog-people

# Conflicts:
#	lib/widgets/folder_card.dart

```

## Parents

- [d33e2bd1fdb93c5335c7b931df1a9c8c76d02a8e](https://git.cafe/dara/icarus/commit/d33e2bd1fdb93c5335c7b931df1a9c8c76d02a8e?format=markdown)

- [35259b92ae75af7203e1f05afc77ef8978e3e45b](https://git.cafe/dara/icarus/commit/35259b92ae75af7203e1f05afc77ef8978e3e45b?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/b4fac486980d19ead1e7325b8c331ff4caa97908?format=markdown)