Piotr Sarnacki 554c8621e3 Merge branch 'master' into ps-ember-update ... Conflicts: Gemfile assets/scripts/travis.coffee		2013-03-09 12:48:35 +01:00
..
flash.hbs	add broadcasts	2012-10-18 03:53:19 +02:00
home.hbs	Remove layout views, just change template on application	2012-10-23 01:40:05 +02:00
profile.hbs	Fix some of the places still using Travis.app	2013-02-21 23:22:54 +01:00
sidebar.hbs	Fix some of the places still using Travis.app	2013-02-21 23:22:54 +01:00
simple.hbs	Remove layout views, just change template on application	2012-10-23 01:40:05 +02:00
top.hbs	Merge branch 'master' into ps-ember-update	2013-03-09 12:48:35 +01:00