OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
riot-web/src/components
History
Luke Barnard fe121126f5 Merge branch 'develop' into rte-fixes 
Conflicts:
	src/UserSettingsStore.js
	src/autocomplete/EmojiProvider.js
	src/components/views/rooms/MessageComposerInput.js
 		2017-05-08 17:08:59 +01:00
..
structures Merge branch 'develop' into rte-fixes 2017-05-08 17:08:59 +01:00
views Merge branch 'develop' into rte-fixes 2017-05-08 17:08:59 +01:00