imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into luke/fix-event-id-state

Browse source 
Conflicts:
	src/components/structures/MatrixChat.js
This commit is contained in:
Luke Barnard 2017-06-08 14:33:58 +01:00
commit ea97d16aa2
13 changed files with 490 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/elements/HomeButton.js
View file

@ -23,7 +23,7 @@ const HomeButton = function(props) {
const ActionButton = sdk.getComponent('elements.ActionButton');
return (
<ActionButton action="view_home_page"
label={ _t("Welcome page") }
label={ _t("Home") }
iconPath="img/icons-home.svg"
size={props.size}
tooltip={props.tooltip}