In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This will make the link "verified" on mastodon.

Filipe Azevedo authored Dec 22, 2022 and Linus Jahn committed Jan 15, 2023

This is somehow how Kaidan will implement the UI.

Filipe Azevedo authored Dec 22, 2022 and Linus Jahn committed Jan 15, 2023

This is the object that poll group chat from REST API.

Filipe Azevedo authored Dec 22, 2022 and Linus Jahn committed Jan 15, 2023

This represent a MUC/MIX group chat.

Filipe Azevedo authored Dec 22, 2022 and Linus Jahn committed Jan 15, 2023

They allow to choose the target container type.

Tibor Csötönyi authored Dec 12, 2022 and Linus Jahn committed Jan 11, 2023

* Add search field busy indicator.

Closes #318

Volker Krause authored Jan 04, 2023 and Linus Jahn committed Jan 08, 2023

An alternative approach going forward might be replacing the entire direct
ZXing use and video stream processing by KF::Prison. Avoids duplicated
maintenance, but adds a new dependency.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"