Merge branch 'develop' into Feriority-coverage

2014-12-30 06:47:13 -06:00
parent 5f66738305 23de3eeff8
commit 486bd72fb0
328 changed files with 16143 additions and 13432 deletions
@@ -2,12 +2,12 @@
  margin-left: 1.25em;
 }*/

-/* Comment out for holiday events */
+/* Comment out for holiday events 
 .npc_ian {
  background: url("../img/sprites/npc_ian.gif") no-repeat;
  width: 78px;
  height: 135px;
-}
+} */

 .Gems {
  display:inline-block;
--- a/Show More
+++ b/Show More