Dev Merge to Master #5645
Merged
Dev Merge to Master #5645
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix merge conflicts Fixed wrong api repo
Fix telegram /logout command
Api update/fix
Used to replace known "faulty" names with something we can recognise. Starting with "mr-mine" -> "mr. mime", but can build on this as we find more. Nidorans come to mind with unicode characters that should be "M" or "F"
[Sniper] Extend support for different source formats
Removed print statement
|
@Gobberwart, thanks for your PR! By analyzing the annotation information on this pull request, we identified @DBa2016, @javajohnHub and @YvesHenri to be potential reviewers |
This was referenced Sep 24, 2016
|
Merging this. No reason to delay. |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Short Description:
I know we just did this, but the pgoapi fix is pretty critical for those using Google accounts.
Any objections?