mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-13 16:13:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
element-web/src/components
History
Michael Telatynski 04aed416d2 Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/MatrixChat.js
2017-06-20 15:37:05 +01:00
..
structures Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 2017-06-20 15:37:05 +01:00
views Merge branch 'develop' into luke/fix-email-cancel-button-text 2017-06-20 13:30:34 +01:00