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
..
app	Merge branch 'master' into settings-pane	2014-01-17 07:09:04 -05:00
config	remove some whitespace	2013-10-07 23:52:17 +02:00
lib	Merge branch 'master' into settings-pane	2014-01-17 07:09:04 -05:00
spec	Merge branch 'master' into settings-pane	2014-01-17 07:09:04 -05:00
vendor	Update Ember to 1.3.1	2014-01-14 18:25:36 +01:00
travis.coffee	Polish build matrix table header	2013-12-15 00:50:48 -05:00