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.
merge conflicts did appear in this 3 places.
app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml (see https://github.com/OpenMage/magento-lts/pull/788/files)
app/locale/en_US/Mage_Adminhtml.csv (Translation was fixed in 1.9.4.2, so we now align with the release here again)
app/code/core/Mage/Compiler/Model/Process.php (deleted in OpenMage)
Follow up PR probably needed for changes in lib/phpseclib/PHP/Compat/Function/ which disabled some fallbacks?