Richard Lewis b893887707 Fix merge conflict

2017-06-12 14:52:41 +01:00

..

avatars

*Avatar: Calculate thumbnail dimensions based on devicePixelRatio

2017-04-27 12:38:03 +02:00

create_room

More i18n strings (#963)

2017-05-30 15:09:57 +01:00

dialogs

Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps

2017-06-12 14:50:25 +01:00

elements

Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps

2017-06-12 14:50:25 +01:00

login

Add remaining strings for vector-im/riot-web#4151

2017-06-02 10:47:08 +01:00

messages

switch to imports

2017-06-01 14:42:44 +01:00

room_settings

First round

2017-06-02 10:18:31 +01:00

rooms

Fix merge conflict

2017-06-12 14:52:41 +01:00

settings

fix all missing translations picked up by check-i18n.pl

2017-05-27 18:20:44 +01:00

voip

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00