Hiro Asari 8b6be08ef4 Merge branch 'master' into settings-pane ... Conflicts: assets/scripts/app/routes.coffee assets/scripts/app/templates/profile/tabs/hooks.hbs		2014-01-17 07:09:04 -05:00
..
ext	change I18n.missingTranslation so that we use the last part of the key, titleized instead of a phat, ugly monster message	2012-11-22 16:24:40 +01:00
travis	Merge branch 'master' into settings-pane	2014-01-17 07:09:04 -05:00