Ruben Vereecken 5d66560673 Merge remote-tracking branch 'upstream/master' into achievements_progress ... Conflicts: app/views/editor/level/LevelEditView.coffee server/levels/sessions/LevelSession.coffee		2014-08-05 11:55:46 +02:00
..
achievements	intermediate	2014-08-04 22:21:43 +02:00
articles	All edits are now tracked	2014-07-04 19:27:38 +02:00
commons	Merge remote-tracking branch 'upstream/master' into achievements_progress	2014-08-05 11:55:46 +02:00
levels	Merge remote-tracking branch 'upstream/master' into achievements_progress	2014-08-05 11:55:46 +02:00
mail/sent	Hard code mail tasks and add unsubscribe	2014-07-16 16:37:06 -07:00
patches	Managed to recalculate translation/misc patches after all	2014-07-24 19:43:09 +02:00
plugins	Added a bunch of achievements to the script. Restyled big parts.	2014-08-03 23:58:51 +02:00
queues	Fixed #1372. Minor fixes.	2014-07-23 08:59:42 -07:00
routes	Merged in name changes from master	2014-07-29 17:28:13 +02:00
users	Merge remote-tracking branch 'upstream/master' into achievements_progress	2014-08-05 11:55:46 +02:00
sendwithus.coffee	Exposing Vector z property. Getting ready to use new builtin property documentation.	2014-06-27 00:36:18 -07:00