Merge branch 'master' into dev

PokemonGoF · Aug 6, 2016 · b5b3e70 · b5b3e70
2 parents 90e5628 + fe2eb5a
commit b5b3e70
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -10,3 +10,4 @@
 ### Other Information
 OS: 
 Git Commit: (run 'git log -n 1 --pretty=format:"%H"' and paste it here)
+Python Version: (run 'python -V' and paste it here)
diff --git a/README.md b/README.md
@@ -69,4 +69,4 @@ To ensure that all updates are documented - [@eggins](https://github.com/eggins)
 - [AHAAAAAAA](https://github.com/AHAAAAAAA/PokemonGo-Map) for parts of the s2sphere stuff
 
 
-[![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-dev)](https://github.com/igrigorik/ga-beacon)
+[![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-master)](https://github.com/igrigorik/ga-beacon)
diff --git a/pokecli.py b/pokecli.py
diff --git a/pokemon_spawn_locations.json b/pokemon_spawn_locations.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,4 +69,4 @@ To ensure that all updates are documented - [@eggins](https://github.com/eggins)
		- [AHAAAAAAA](https://github.com/AHAAAAAAA/PokemonGo-Map) for parts of the s2sphere stuff


		[![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-dev)](https://github.com/igrigorik/ga-beacon)
		[![Analytics](https://ga-beacon.appspot.com/UA-81468120-1/welcome-page-master)](https://github.com/igrigorik/ga-beacon)