Contents of PR #2276 without duplicated commit #2375
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is
fschill:file_media_relink
merged into currentdevelop
, which git was happy to do with no conflicts on my local system. So, I suppose this would be a candidate for merging instead of #2276.(If what's here is ready for merge. I feel like we weren't totally clear on that yet in #2276, but then got hung up on the conflict.)