Kegan Dougal c91b642a8b Merge branch 'develop' into kegan/delete-empty-files ... Conflicts: src/skins/vector/views/molecules/EventAsTextTile.js		2015-10-27 09:19:08 +00:00
..
css	oops - wrong branch	2015-10-23 02:38:32 +01:00
fonts	oops - wrong branch	2015-10-23 02:38:32 +01:00
img	oops - wrong branch	2015-10-23 02:38:32 +01:00
views	Merge branch 'develop' into kegan/delete-empty-files	2015-10-27 09:19:08 +00:00
header	More fixing up of vector skin	2015-09-22 18:49:04 +01:00
skindex.js	Factor out stuff commnon to all timeline events into EventTile: makes timestamp & edit button etc appear on everything, not just messages.	2015-10-21 17:52:34 +01:00
skinfo.json	More fixing up of vector skin	2015-09-22 18:49:04 +01:00