2 commits

Author	SHA1	Message	Date
Achilleas Pipinellis	af1dabe805	Reduce size of images from 25MB to 13MB using pngquant ... Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232 [ci skip]	2016-11-22 19:53:43 +01:00
Sean McGivern	b79378cae8	Add merge conflict docs	2016-08-12 23:24:49 +03:00