4 commits

Author	SHA1	Message	Date
Roger Braun	2f52669380	Merge branch 'develop' into wakarimasen/pleroma-fe-develop	2017-03-09 09:19:40 +01:00
wakarimasen	289326855c	Add focused prop to status	2017-03-05 16:31:01 +01:00
wakarimasen	c921662036	Add inConversation prop to status	2017-03-05 14:34:14 +01:00
Roger Braun	800b051a16	Add statusOrConversation component.	2017-02-04 13:53:07 +01:00