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

Browse Source

Conflicts:
	src/components/views/elements/Pill.js

...

This commit is contained in:

Luke Barnard

2017-07-21 14:08:36 +01:00

parent 7db7192701 8ef820054d

commit 03aba64b97

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available