Merge remote-tracking branch 'upstream/master' into tournaments

This commit is contained in:
小太
2013-11-11 18:38:16 +11:00
24 changed files with 3373 additions and 3245 deletions

View File

@@ -121,7 +121,7 @@
var app = new App();
</script>
<script src="data/learnsets.js"></script>
<script src="data/learnsets-g6.js"></script>
<script src="js/lib/jquery.slider.min.js"></script>
<script src="data/pokedex.js"></script>