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

master merge to dev #5908

Merged
merged 2 commits into from
Feb 9, 2017
Merged

master merge to dev #5908

merged 2 commits into from
Feb 9, 2017

Commits on Feb 7, 2017

  1. Merge pull request #5903 from PokemonGoF/dev 

    Dev merge to master
    @solderzzc
    solderzzc authored Feb 7, 2017
    Configuration menu
    Copy the full SHA
    fda3ab8 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2017

  1. BUGFIX: Poke hunter lockon (#5904) 

    * Small fix, reset the lock when not found

* Adjustments when to lock on

* BUGFIX: check if property is there before read
    @davidakachaos @solderzzc
    davidakachaos authored and solderzzc committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    eaab3f5 View commit details
    Browse the repository at this point in the history