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
..
handlebars.coffee	Move settings out of the profile page	2013-12-18 11:02:24 +01:00
helpers.coffee	HTTPS everywhere for github.com	2014-01-11 15:11:03 -05:00
i18n_handlebars.coffee	Fixed I18n handlebars helpers to update when locale changes	2012-12-11 08:54:43 +09:00
urls.coffee	HTTPS everywhere for github.com	2014-01-11 15:11:03 -05:00