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] Wrong font-family order #11191

Merged
merged 9 commits into from
Jun 20, 2018
Merged

[FIX] Wrong font-family order #11191

merged 9 commits into from
Jun 20, 2018

Commits on Jun 7, 2018

  1. Merge pull request #1 from RocketChat/master 

    Master
    @myfonj
    myfonj committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    d408337 View commit details
    Browse the repository at this point in the history

  2. fix body font family order

    @myfonj
    myfonj committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    b281362 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into fix-body-font-family

    @myfonj
    myfonj committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    54a6bb9 View commit details
    Browse the repository at this point in the history

  4. Update variables.js

    @engelgabriel
    engelgabriel committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    276b235 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into fix-body-font-family

    @engelgabriel
    engelgabriel committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    469adcd View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Merge branch 'develop' into fix-body-font-family

    @myfonj
    myfonj committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    ac58985 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. Merge commit 'refs/pull/11038/head' of github.com:RocketChat/Rocket.C… 

    …hat into fix.body-font-family
    @pierre-lehnen-rc
    pierre-lehnen-rc committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    198c5ad View commit details
    Browse the repository at this point in the history

  2. Set new font stack where the old one is still used

    @pierre-lehnen-rc
    pierre-lehnen-rc committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    def7326 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into fix.body-font-family

    @Hudell
    Hudell committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    074b0a0 View commit details
    Browse the repository at this point in the history