Scott Erickson 07afba01df Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/views/editor/level/thangs_tab_view.coffee		2014-04-17 13:25:42 -07:00
..
articles	Moved the model schemas into a models folder.	2014-04-12 10:51:02 -07:00
commons	Fixed the watch buttons for levels and components.	2014-04-16 11:02:40 -07:00
levels	Made spectate mode use top 20 players only	2014-04-14 14:28:29 -07:00
patches	Moved the model schemas into a models folder.	2014-04-12 10:51:02 -07:00
plugins	Merge branch 'feature/jsondiffpatch'	2014-04-11 22:52:58 -07:00
queues	Fixed isRanking and reduced logging	2014-04-14 11:01:55 -07:00
routes	Non-admins can save (but not overwrite) file uploads.	2014-04-12 13:03:46 -07:00
users	Implement rank column in simulators leaderboard	2014-04-15 23:13:10 +01:00
sendwithus.coffee	Turned off sendwithus API during testing.	2014-04-08 19:08:33 -07:00