Paulus Schoutsen 63e039a221 Merge branch 'pr/6'
Conflicts:
	src/components/entity/ha-state-label-badge.js
2015-09-16 08:58:28 -07:00
..
2015-08-30 17:51:00 -07:00
2015-09-16 08:58:28 -07:00
2015-09-13 01:07:11 -07:00
2015-08-29 18:15:58 -07:00
2015-09-15 20:17:43 +02:00
2015-08-29 18:15:58 -07:00
2015-08-29 18:15:58 -07:00
2015-07-12 17:31:41 -07:00