-
Notifications
You must be signed in to change notification settings - Fork 21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge onboarding improvements branch into consolidated ad #2627
Merge onboarding improvements branch into consolidated ad #2627
Conversation
…e-tests Update e2e tests for #2487
Set WPCOM_API_STATUS transient for E2E tests
Release 2.8.5
Release 2.8.5 - Merge `trunk` to `develop`
…nch-checklist-items Remove pre launch checklist items
…nch-checklist 2492: Remove PreLaunchChecklist component
…de-tax-rate-selection-ui-onboarding
…election-ui-onboarding Hide Tax UI during onboarding & keep in edit campaign
…nsolidate-ad-creation-ccf-onboarding-merged
@asvinb I've updated feature/2459-campaign-creation-flow so that it includes the code from feature/2458-streamline-onboarding, which is the branch it will be merging into. Now that this is done, #2623 is showing conflicts with the following files:
All of these seem to be handled in your latest commits after merging in the code from #2458. I'm going to go ahead and merge this and then we can resolve any remaining conflicts in PR #2623, which will need to be reviewed and QAed before merging anyway. |
ab1f837
into
update/2535-consolidate-ad-creation-ccf-merged
Changes proposed in this Pull Request:
Merge #2458 and fix merge conflicts.