Luke Barnard 28b8582bd6 Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings

2017-10-04 10:37:45 +01:00

..

avatars

Fix GroupView summary rooms displaying without avatars

2017-09-27 16:18:15 +01:00

create_room

Add more translations..

2017-06-08 09:44:58 +01:00

dialogs

Fix merge conflict

2017-10-02 17:57:22 +02:00

elements

Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings

2017-10-04 10:37:45 +01:00

groups

Add confirmation dialog for removing room from group

2017-10-03 11:16:22 +01:00

login

Add rule to enforce spacing in curly brackets in JSX children

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

messages

Add rule to enforce spacing in curly brackets in JSX children

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

room_settings

Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings

2017-10-04 10:37:45 +01:00

rooms

Fix merge conflict

2017-10-02 17:57:22 +02:00

settings

apply i18n _t to string which has already been translated

2017-09-22 20:04:04 +01:00

voip

Add rule to enforce spacing in curly brackets in JSX children

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