Michael Schmatz d8df61f94b Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/templates/play/ladder/ladder.jade		2014-05-19 19:43:47 -07:00
..
ladder.jade	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 19:43:47 -07:00
ladder_tab.jade	Added some i18n tags.	2014-05-02 11:00:30 -07:00
my_matches_tab.jade	Rules wording tweaks; highlighting new matches and end of ranking with sounds.	2014-05-19 19:13:36 -07:00
play_modal.jade	Don't show tutorial level link if tutorial level doesn't exist for a ladder level.	2014-04-28 10:54:03 -07:00
simulate_tab.jade	Live simulation count and fixed double simulator leaderboard session	2014-05-16 13:16:35 -07:00