# Merge remote-tracking branch 'origin/main' into fix/general-settings-contract · lucenx/codexbar-plasma

[View on GitCafe](https://git.cafe/lucenx/codexbar-plasma/commit/a7d93cc91d09c10ede12e1dd61911d0653245836)

Repository: [lucenx/codexbar-plasma](https://git.cafe/lucenx/codexbar-plasma)

Visibility: public

Requested revision: a7d93cc91d09c10ede12e1dd61911d0653245836

Requested commit: a7d93cc91d09c10ede12e1dd61911d0653245836

Commit: a7d93cc91d09c10ede12e1dd61911d0653245836

Tree: 9e5f257b407380fa51982af22d0347d380459ace

Author: Simone

Committer: Simone

## Message

```
Merge remote-tracking branch 'origin/main' into fix/general-settings-contract

# Conflicts:
#	README.md

```

## Parents

- [2ed51379a8a7f356b3bc5ad8236b1b0b1d36eaf5](https://git.cafe/lucenx/codexbar-plasma/commit/2ed51379a8a7f356b3bc5ad8236b1b0b1d36eaf5?format=markdown)

- [2901ce36704e5dc2eaab9254644da210f3f5085d](https://git.cafe/lucenx/codexbar-plasma/commit/2901ce36704e5dc2eaab9254644da210f3f5085d?format=markdown)

[Source at this commit](https://git.cafe/lucenx/codexbar-plasma/tree/a7d93cc91d09c10ede12e1dd61911d0653245836?format=markdown)