9 Commits (18f8f8858c92d11806bf08d5c1125f562f7871b2)

Author	SHA1	Message	Date
Travis Ralston	fde32f13a5	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
Michael Telatynski	c551f2983a	Add TextualBody-test.js ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-01-06 13:28:29 +00:00
Travis Ralston	042bd35d79	Fix MatrixClientPeg imports	2019-12-22 21:15:54 -07:00
Travis Ralston	806d728d59	Import from the js-sdk's src/ directory ... Because ES6 and such.	2019-12-22 21:14:33 -07:00
Travis Ralston	be4eeb5e07	Fix js-sdk imports for new module	2019-12-22 21:10:26 -07:00
Travis Ralston	d56f0f2a25	Convert many imports to handle ES6 exports ... Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761	2019-12-22 21:04:42 -07:00
Bruno Windels	a1548285b5	fix copyright header and whitespace	2019-06-26 16:13:15 +02:00
Bruno Windels	19b4699bc2	WIP for showing pills in edit history	2019-06-26 11:59:56 +02:00
Bruno Windels	e54881aa24	WIP	2019-06-26 11:59:56 +02:00