Michael Telatynski 876acc0f76 Merge branches 'develop' and 't3chguy/restore_composer_history' of github.com:matrix-org/matrix-react-sdk into t3chguy/restore_composer_history ...

# Conflicts:
#	src/components/views/rooms/MessageComposerInput.js

2019-06-14 12:26:05 +01:00

..

auth

Random blank lines

2019-06-13 18:31:04 +01:00

avatars

Merge branch 'develop' into matthew/low_bandwidth

2019-05-30 19:42:09 -06:00

context_menus

spelling

2019-06-04 14:53:01 +00:00

create_room

…

dialogs

Fix AddressPickerDialog adding wrong entry to selected list case

2019-06-07 00:00:38 +01:00

directory

Don't include all networks by default in the room directory

2019-04-05 10:50:01 -06:00

elements

use EditorStateTransfer to pass on state to newly mounted editor

2019-06-12 18:52:34 +02:00

globals

…

groups

replace emojione with twemoji. completely untested & debugged & unoptimised

2019-05-19 15:23:43 +01:00

messages

Merge pull request #3097 from matrix-org/bwindels/edit-unsent

2019-06-13 14:00:46 +00:00

right_panel

adjust prop in HeaderButton

2019-04-11 18:32:38 +02:00

room_settings

…

rooms

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

2019-06-14 12:26:05 +01:00

settings

Add license info for Twemoji

2019-06-06 14:20:13 +01:00

verification

replace emojione with twemoji. completely untested & debugged & unoptimised

2019-05-19 15:23:43 +01:00

voip

…