PrinsFrank 3d5be62250 Add article on resolving merge conflicts (#9386)		2020-11-13 15:38:28 +01:00
..
aliases.md	Multiple grammar fixes in markdown files	2020-07-01 02:43:13 +07:00
authentication-for-private-packages.md	Update authentication-for-private-packages.md	2020-10-25 19:05:51 +01:00
autoloader-optimization.md	Merge branch '1.10'	2020-10-24 09:59:46 +02:00
custom-installers.md	Mention no-slash requirement for getInstallPath()	2020-11-05 15:17:27 +01:00
handling-private-packages.md	Merge branch '1.10'	2020-10-24 09:59:46 +02:00
plugins.md	Fix the current plugin api version in the doc	2020-10-26 12:16:11 +01:00
repository-priorities.md	Fix the doc about repository priorities	2020-04-10 13:32:55 +02:00
resolving-merge-conflicts.md	Add article on resolving merge conflicts (#9386)	2020-11-13 15:38:28 +01:00
scripts.md	Merge branch '1.10'	2020-10-24 09:59:46 +02:00
troubleshooting.md	Setting permissions prevents a warning from swapon	2020-10-22 17:50:35 +00:00
vendor-binaries.md	Change `dependencies` to `binaries`	2018-02-01 14:43:38 +00:00
versions.md	Add more backticks for consistency	2020-10-24 18:10:57 +02:00