Dominik Kundel fe8a4901de Merge remote-tracking branch 'upstream/master' ... Conflicts: app/locale/de.coffee bower.json		2014-03-25 17:07:36 +01:00
..
User.coffee	Merged	2014-03-16 10:06:47 -07:00
user_handler.coffee	First pass on setting up gplus friends on the ladder page.	2014-03-23 09:30:01 -07:00
user_schema.coffee	Merge remote-tracking branch 'upstream/master'	2014-03-25 17:07:36 +01:00