Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix last mobile merge into master #14620

Merged
merged 4 commits into from
Mar 26, 2019
Merged

Fix last mobile merge into master #14620

merged 4 commits into from
Mar 26, 2019

Commits on Mar 25, 2019

  1. Add back Heading native changes that were overwritten during last mer… 

    …ge of rnmobile/develop into master
    @Tug
    Tug committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    e73672b View commit details
    Browse the repository at this point in the history

  2. Add back Paragraph native changes that were overwritten during last m… 

    …erge of rnmobile/develop into master
    @Tug
    Tug committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    d32725b View commit details
    Browse the repository at this point in the history

  3. [Native mobile] Bring release v1.0.1 back to "mobile develop" (#14075) 

    * Don't allow placeholder to moves once we tap on it (#14066)

* Use platform based SCSS vars for block minHeight (#14070)

# Conflicts:
#	packages/block-library/src/heading/edit.native.js
#	packages/editor/src/components/post-title/style.native.scss
    @hypest @SergioEstevao
    hypest authored and SergioEstevao committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    b812b2e View commit details
    Browse the repository at this point in the history

  4. Remove unecessary imports in scss files

    @Tug
    Tug committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    71ba477 View commit details
    Browse the repository at this point in the history