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

fix merge conflicts

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-13 18:00:04 +00:00
commit 7a1e6bbe7e
4 changed files with 84 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/RoomSettings.js
View file

@ -381,7 +381,7 @@ module.exports = React.createClass({
<input type="checkbox" ref="guests_join" defaultChecked={guest_access === "can_join"}/>
Allow guests to join this room
</label> <br/>
<label className="mx_RoomSettings_encrypt"><input type="checkbox" /> Encrypt room</label> <br/>
<label className="mx_RoomSettings_encrypt"><input type="checkbox" /> Encrypt room</label>
{ room_colors_section }