Stefan Parviainen 53e983f9c7 Fix merge conflict ...

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

2017-10-25 18:19:27 +02:00

..

avatars

Add click-to-open-settings functionality to GroupAvatar

2017-10-23 14:54:57 +01:00

create_room

Run eslint --fix

2017-10-11 17:56:17 +01:00

dialogs

Fix merge conflict

2017-10-25 18:19:27 +02:00

elements

Fix merge conflict

2017-10-25 18:19:27 +02:00

groups

Merge branch 'develop' into departify

2017-10-24 18:27:24 +02:00

login

Fix italics and parens

2017-10-15 18:01:57 +02:00

messages

Fix SenderProfile

2017-10-17 21:32:35 +02:00

room_settings

canSetRelatedRooms -> canSetRelatedGroups

2017-10-24 17:57:26 +01:00

rooms

Fix merge conflict

2017-10-25 18:19:27 +02:00

settings

Add option to unset your own avatar

2017-10-13 21:13:47 -06:00

voip

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00