5 Commits (82e3059c6ee347c7486522cc70ba23cc92072ec9)

Author	SHA1	Message	Date
immeëmosol	bbcadcb35e	Hint at improved merge conflict resolving (#10840)	2022-06-22 13:47:15 +02:00
gnito-org	239638e687	Fix minor spelling & grammar issues in docs (#10370)	2021-12-19 15:15:21 +01:00
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