Merged master into 1.0.1

This commit is contained in:
Deukhoofd committed 2016-02-27 01:03:19 +01:00
commit edad424acc
19 files changed
+18 -16

No files matched your search

+1 -1
View File
@@ -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')