Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-12-05 18:30:42 -08:00
commit 2fe7084fba

View file

@ -457,7 +457,7 @@ dungeon = [
x: 78 x: 78
y: 29 y: 29
nextLevels: nextLevels:
continue: 'descending-further' continue: 'the-second-kithmaze'
} }
{ {
name: 'Riddling Kithmaze' name: 'Riddling Kithmaze'