Stefan Parviainen d6f1e12bee Fix merge conflict ...

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

2017-11-01 15:50:45 +01:00

..

avatars

Fix initial in GroupAvatar in GroupView

2017-10-30 15:04:12 +00:00

create_room

…

dialogs

Fix merge conflict

2017-11-01 15:50:45 +01:00

elements

Fix merge conflict

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

groups

Fix merge conflict

2017-11-01 15:50:45 +01:00

login

…

messages

Merge branch 'develop' into departify

2017-10-27 19:23:13 +02:00

room_settings

canSetRelatedRooms -> canSetRelatedGroups

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

rooms

Merge branch 'develop' into departify

2017-10-27 19:23:13 +02:00

settings

Don't refresh page on password change prompt

2017-10-30 16:28:27 +00:00

voip

Default to false

2017-10-26 10:06:04 +01:00