fix when composite repo has no delegates
Fix typo. when safemode is enabled we experienced the problem with ini_get arguments number
Merge pull request #2020 from nickolay-cure4you/master

Fix typo
Update docs to point out the problem with range constraints for conflict links.
Merge pull request #2022 from webfactory/issue-2022

"conflict" does not work for non-trivial constraints
fixed Bitbucket's broken API
Merge pull request #2035 from xrstf/bitbucket-api-fix

fixed Bitbucket's broken API
Avoid throwing when checking for disk space, fixes #2039
Merge remote-tracking branch 'kriswallsmith/composite-repo-fix'
Add test assertion
Stop trying to bypass https since github does not and will not support non-https transports
Remove the http protocol from github-protocols, refs #1955
Fix tests
Update 04-schema.md

Added example line for how to enable prefer-stable. Some other examples in the document show options enabled using the string "true" and since this is not the case for prefer-stable I added an example to avoid confusion.
Merge remote-tracking branch 'erikmaarten/patch-1'
Make more obvious
Allow 5.3.3 failures since they dont have openssl
doc intro and libraries typos
Merge pull request #2054 from peterkokot/patch-doc

Doc intro and libraries typos
Fix detection of versions with git 1.8+, fixes #2065