Skip to content

Merge master 1.24 to develop#2045

Merged
marecar3 merged 32 commits intodevelopfrom
merge_master_1.24_to_develop
Mar 23, 2020
Merged

Merge master 1.24 to develop#2045
marecar3 merged 32 commits intodevelopfrom
merge_master_1.24_to_develop

Conversation

@marecar3
Copy link
Copy Markdown
Contributor

@marecar3 marecar3 commented Mar 23, 2020

Related Gutenberg PR

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

marecar3 and others added 30 commits March 17, 2020 11:01
@marecar3
Bump package.json version to 1.24.0
7b2b3be
@marecar3
Bump android aztec version
4ae86e2
@marecar3
Update bundle
3c59d2b
@marecar3
Add latest posts json files
ca5c303 
Add react-nartive-url-polyfill json file
@marecar3
Remove wrong release note
d8a20a6
@marecar3
Update Aztec-iOS version
4c8d4b6
@marecar3
Update gb reference
42ae7f0
@SergioEstevao
Update podfile lock file.
24b184c
@SergioEstevao
Update GB reference with fix for spacer.
860ebf6
@SergioEstevao
Update GB with fix for file URL checking.
7d24289
@SergioEstevao
Update GB reference
01ef944
@marecar3
Update bundle
9e4e6a5
@marecar3
Update gb-mobile reference
48364c4
@marecar3
Update bundle
8369b1e
@SergioEstevao
Update GB reference.
6e1cf7c
@SergioEstevao
Update GB reference.
a26e690
@SergioEstevao
Merge pull request #2030 from wordpress-mobile/issue/fix_spacer_max
b21c5db 
Issue/fix spacer max
@marecar3
Update gb reference
97ffd77
@SergioEstevao
Update GB reference.
adbd7d1
@marecar3
Update bundle
69f4ac1
@SergioEstevao
Merge pull request #2032 from wordpress-mobile/issue/fix_check_for_fi…
60f54ed 
…le_urls

Fix check for file urls
@marecar3
Update gb reference
516218d
@marecar3
cherry pick from api fetch PR
0089260
@marecar3
Update bundle files
90a3633
@marecar3
Cherry pick - dark mode implementation
8b3be07
@marecar3
Update bundle files
841b8c7
@marecar3
Update gutenberg reference
8d80fc0
@marecar3
Revert dark mode on Android
f6c426d
@marecar3
Update bundle files
462d971
@cameronvoell
Merge pull request #2025 from wordpress-mobile/release/1.24.0
d584f8d 
1.24.0 Release -> Master
@marecar3 marecar3 requested review from Tug and cameronvoell March 23, 2020 10:02
This was referenced Mar 23, 2020
Closed
Merged
Tug
Tug approved these changes Mar 23, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@Tug Tug left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@marecar3
Copy link
Copy Markdown
Contributor Author

marecar3 commented Mar 23, 2020

Thanks @Tug!

@marecar3 marecar3 merged commit 79dbfb8 into develop Mar 23, 2020
@marecar3 marecar3 deleted the merge_master_1.24_to_develop branch March 23, 2020 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cameronvoell cameronvoell Awaiting requested review from cameronvoell

1 more reviewer

@Tug Tug Tug approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

release-process

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@marecar3 @Tug @SergioEstevao @cameronvoell