Stefan Parviainen 35cb52febc Fix merge conflict

2017-09-27 08:41:37 +02:00

..

avatars

Add user list to groups

2017-07-25 15:56:16 +01:00

create_room

Add more translations..

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

dialogs

Fix merge conflict

2017-09-27 08:41:37 +02:00

elements

Fix merge conflict

2017-09-27 08:41:37 +02:00

groups

Implement "Add room to group" feature

2017-09-26 14:49:13 +01:00

login

_tJsx returns a React Object, the sub fn must return a React Object

2017-08-26 08:18:55 +01:00

messages

Separate sender profile into elements with classes

2017-09-19 16:56:14 +01:00

room_settings

Use translation in img alt text

2017-09-24 09:43:52 +02:00

rooms

Fix merge conflict

2017-09-27 08:41:37 +02:00

settings

apply i18n _t to string which has already been translated

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

voip

Avoid re-rendering RoomList on room switch

2017-09-11 16:59:09 +01:00