There are some conflicts between the branches that I've yet to solve.
The worst of it came from #109, whose commits were all already included in the API-4.0.0 branch. I've created an empty merge of that commit to resolve it.
The rest of the diff currently remains unmerged and it's likely that some changes may end up getting discarded.
There are some conflicts between the branches that I've yet to solve.
The worst of it came from #109, whose commits were all already included in the API-4.0.0 branch. I've created an empty merge of that commit to resolve it.
The rest of the diff currently remains unmerged and it's likely that some changes may end up getting discarded.