Sean McGivern f99941d7ec Keep trailing newline when picking conflict sections ... If our side of the conflict file has a trailing newline, and we are picking sections, not editing the whole content, then add a trailing newline back.		2017-06-01 14:04:21 +01:00
..
assets	Merge branch '30502-fix-bottom-padding-job-page' into 'master'	2017-05-30 16:24:04 +00:00
controllers	Merge branch 'rework-authorizations-performance' into 'master'	2017-05-29 15:49:56 +00:00
finders
helpers	Merge branch '30410-revert-9347-and-10079' into 'master'	2017-05-30 18:47:55 +00:00
mailers	Bugfix: Always use the default language when generating emails.	2017-05-25 10:22:45 -05:00
models	Merge branch '30410-revert-9347-and-10079' into 'master'	2017-05-30 18:47:55 +00:00
policies
presenters
serializers	Expose remove_source_branch boolean/null	2017-05-24 21:54:57 -03:00
services	Keep trailing newline when picking conflict sections	2017-06-01 14:04:21 +01:00
uploaders
validators	Avoid crash when trying to parse string with invalid UTF-8 sequence	2017-05-30 15:05:52 +00:00
views	Merge branch 'back-port-locked-milestones-to-ce' into 'master'	2017-05-30 14:53:57 +00:00
workers	Merge branch 'issue_19262' into 'master'	2017-05-25 18:59:35 +00:00