Luke Barnard 11f3a1db72 Merge branch 'luke/feature-async-pills' of github.com:matrix-org/matrix-react-sdk into luke/feature-async-pills

2017-07-25 09:37:47 +01:00

..

structures

Implement disabled-by-default setting for auto-replacement of plaintext emojis

2017-07-13 17:37:43 +01:00

views

Merge branch 'luke/feature-async-pills' of github.com:matrix-org/matrix-react-sdk into luke/feature-async-pills

2017-07-25 09:37:47 +01:00