Merged master into 1.0.1

2025-10-28 18:20:04 +00:00 · 2016-02-27 01:03:19 +01:00
parent 35623093b3 d243354cc2
commit edad424acc
19 changed files with 18 additions and 16 deletions
--- a/client/app/js/models/battles/pokemon.coffee
+++ b/client/app/js/models/battles/pokemon.coffee
@@ -268,7 +268,7 @@ class @Pokemon extends Backbone.Model

    slugSpecies = slugify(@get('species'))
    slugForme = slugify(@get('forme'))
-    "//pokebattle.com/dex/pokemon/#{slugSpecies}/#{slugForme}"
+    "//wiki.p-insurgence.com/#{slugSpecies}"

  getIllu: ->
    @get('illu')