Jeremy Mikola dadb93fb34 Merge branch 'v1.14' ...

v1.14 pointed to libmongoc 1.14.2, which was released some time after the submodule target in the master branch (a dev commit before libmongoc 1.23.0). To resolve this conflict, the libmongoc submodule has been bumped to 1.23.0.

Note: a libmongoc 1.23.1 tag also exists, but that bump can be done in a subsequent PHPC ticket related to the libmongoc changes therein.

This also adds a section to CONTRIBUTING.md to provide guidance on resolving submodule merge conflicts.

2022-10-20 21:44:20 +08:00

..

autotools

PHPC-2152: Link libresolv when detecting res_nsearch (#1371)

2022-10-18 22:25:43 -04:00

configs

Include usable gdbinit

2015-04-01 14:52:24 -07:00

clang-format.sh

PHPC-1709: Add typing information to arginfo (#1337)

2022-08-03 08:42:07 +02:00

convert-bson-corpus-tests.php

PHPC-1918: Update Javascript and Symbol BSON corpus tests (#1256)

2021-08-26 10:57:36 -04:00

update-submodule-sources.php

PHPC-2049: BulkWrite and Query support comment option of any type (#1320)

2022-05-20 11:11:18 -04:00