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
@@ -1863,7 +1863,7 @@
};
slugSpecies = slugify(this.get('species'));
slugForme = slugify(this.get('forme'));
return "//pokebattle.com/dex/pokemon/" + slugSpecies + "/" + slugForme;
return "//wiki.p-insurgence.com/" + slugSpecies;
};
Pokemon.prototype.getIllu = function() {
+1 -1
View File
@@ -1863,7 +1863,7 @@
};
slugSpecies = slugify(this.get('species'));
slugForme = slugify(this.get('forme'));
return "//pokebattle.com/dex/pokemon/" + slugSpecies + "/" + slugForme;
return "//wiki.p-insurgence.com/" + slugSpecies;
};
Pokemon.prototype.getIllu = function() {