This repository was archived by the owner on Sep 15, 2025. It is now read-only.
Merge trunk + update README in wpios-edition
#840
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [rexml](https://github.com/ruby/rexml) from 3.2.6 to 3.3.9. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](ruby/rexml@v3.2.6...v3.3.9) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
This is an attempt to address the 500 error we got from the API when trying to publish version 17.3.0. See https://buildkite.com/automattic/wordpresskit-ios/builds/1908#01934d17-d6b4-43c7-9005-0fcb799f5222
mokagio
force-pushed
the
mokagio/prepare-wpios-edition-for-merge
branch
from
37148b6 to
62938ce
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
See internal discussion at pbArwn-7sp-p2
I opened a PR for this because #816 cannot be merged without first resolving conflicts. There is only one conflict, the deleted
podspec.While the
podspecshould stay deleted, this PR is useful to show the changes from #822. I think they are fine to merge and bring into WordPress-Jetpack-Reader, but I'll let @kean and @crazytonyli give they're more expert opinion on it.After this land in #816, we can merge that into
trunk.