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

Merge 2.4 into master #4872

Merged
merged 5 commits into from
May 3, 2019
Merged

Merge 2.4 into master #4872

merged 5 commits into from
May 3, 2019

Commits on May 2, 2019

  1. Fix image dpi

    @sbrunner
    sbrunner committed May 2, 2019
    Configuration menu
    Copy the full SHA
    a929b68 View commit details
    Browse the repository at this point in the history

  2. Add back iconOffset support for the API

    @fredj
    fredj committed May 2, 2019
    Configuration menu
    Copy the full SHA
    a1cbb09 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2019

  1. Merge pull request #4869 from camptocamp/GSGMF-938 

    Add back iconOffset support for the API
    @fredj
    fredj authored May 3, 2019
    Configuration menu
    Copy the full SHA
    c4064b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4867 from camptocamp/qgis-image-dpi 

    Fix image DPI
    @sbrunner
    sbrunner authored May 3, 2019
    Configuration menu
    Copy the full SHA
    92c3776 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/2.4'

    @fredj
    fredj committed May 3, 2019
    Configuration menu
    Copy the full SHA
    bb4da84 View commit details
    Browse the repository at this point in the history