Luke Barnard 87609582c6 Merge branch 'develop' into rte-fixes2 ...

Conflicts:
	package.json
	src/autocomplete/CommandProvider.js
	src/autocomplete/UserProvider.js
	src/components/structures/RoomView.js
	src/components/structures/UserSettings.js
	src/components/views/rooms/MessageComposerInput.js

2017-06-23 15:30:06 +01:00

..

login

Fix race in registration for pusher config

2017-06-19 10:22:18 +01:00

ContextualMenu.js

…

CreateRoom.js

fix missing translations and typos in i18n

2017-06-07 18:24:35 +01:00

FilePanel.js

Translate src/components/structures

2017-06-07 11:40:46 +01:00

InteractiveAuth.js

remove unused imports

2017-06-02 21:35:55 +01:00

LoggedInView.js

Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff

2017-06-20 13:44:27 +01:00

MatrixChat.js

Fix potential race in setting client listeners

2017-06-23 10:48:21 +01:00

MessagePanel.js

don't lose date seperator when the first event of the new day is redacted

2017-06-02 04:39:44 +01:00

NotificationPanel.js

…

RoomStatusBar.js

Translate src/components/structures

2017-06-07 11:40:46 +01:00

RoomView.js

Merge branch 'develop' into rte-fixes2

2017-06-23 15:30:06 +01:00

ScrollPanel.js

Revert "Save scroll state immediately before updating"

2017-06-19 13:19:17 +01:00

TimelinePanel.js

Add some logging around switching rooms

2017-06-07 22:41:02 +01:00

UploadBar.js

Translate src/components/structures

2017-06-07 11:40:46 +01:00

UserSettings.js

Merge branch 'develop' into rte-fixes2

2017-06-23 15:30:06 +01:00