Robert Speicher 75ed0e27d9 Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' ... Handle non-UTF-8 conflicts gracefully ## What does this MR do? If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI. ## What are the relevant issue numbers? Closes #21247. See merge request !5961		2016-08-25 19:08:38 +00:00
..
account	Add two factor recovery endpoint to internal API	2016-08-24 17:50:57 -05:00
admin_area	Clarify the features for generating default label sets	2016-08-09 14:29:16 +01:00
img	Move markdown doc to the right location	2016-08-03 08:54:17 +03:00
project	Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master'	2016-08-25 19:08:38 +00:00
markdown.md	Move markdown doc to the right location	2016-08-03 08:54:17 +03:00
permissions.md	Add 'Accept merge request' to permissions table	2016-07-12 18:16:38 +03:00