DO NOT MERGE CHANGES FROM THIS REPO's MASTER BRANCH

Requests against upstream

use maintaina-bare branch for pure code changes without touching composer.json, package.xml, changelog and with minimal edits to .horde.yml if required

rebase horde-upstream branch on horde upstream repo
rebase maintaina-bare on horde-upstream and fix any conflicts
rebase maintaina-composerfixed on maintaina-bare or drop and recreate the branch. Then generate a new composer.json. You will probably need a custom components/config/bin for a satis repo or downstream git repo
rebase master branch on maintaina-composerfixed. This should never fail as they only differ by this readme

Name		Name	Last commit message	Last commit date
Latest commit History 177 Commits
.github/workflows		.github/workflows
bin		bin
doc/Horde/Kolab/Cli		doc/Horde/Kolab/Cli
lib/Horde/Kolab		lib/Horde/Kolab
locale		locale
test/Horde/Kolab/Cli		test/Horde/Kolab/Cli
.gitignore		.gitignore
.horde.yml		.horde.yml
.travis.yml		.travis.yml
LICENSE		LICENSE
README.md		README.md
composer.json		composer.json
package.xml		package.xml
phpunit.xml.dist		phpunit.xml.dist