Michael Telatynski bdb2d6b475 Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings ...

# Conflicts:
#	src/components/structures/MatrixChat.js

2017-08-17 13:39:19 +01:00

..

avatars

Change incorrect refs to this.props

2017-07-11 14:31:07 +01:00

create_room

Add more translations..

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

dialogs

Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings

2017-08-17 13:39:19 +01:00

elements

Merge pull request #1300 from matrix-org/dbkr/userpicker

2017-08-16 14:29:07 +01:00

login

Add misiing _tJsx import

2017-08-16 23:55:43 +02:00

messages

Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics

2017-08-10 13:54:55 +01:00

room_settings

un-i18n Modal Analytics

2017-07-27 17:19:18 +01:00

rooms

Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings

2017-08-17 13:39:19 +01:00

settings

don't track error messages

2017-08-10 13:49:11 +01:00

voip

de-lint views/voip/*

2017-07-01 14:58:46 +01:00