3 Commits (6a7264fc2dae6cd22abb10b82bd2b615e11a0031)

Author	SHA1	Message	Date
Wouter de Jong	bb128c465c	Capitalize Composer in the docs	2021-10-25 13:11:56 +02:00
Wouter de Jong	6aec6ecbfa	Use `composer.phar` consistently in the examples	2021-10-25 13:11:41 +02:00
PrinsFrank	3d5be62250	Add article on resolving merge conflicts (#9386)	2020-11-13 15:38:28 +01:00