Merge develop

master
Torjus 2018-08-02 13:00:27 +02:00
parent 9e23683f0b
commit c249472423
1 changed files with 3 additions and 0 deletions

View File

@ -5,10 +5,13 @@ import * as appPropTypes from '../appPropTypes';
import * as stateActions from '../../redux/stateActions'; import * as stateActions from '../../redux/stateActions';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ListPeer from './ListPeer'; import ListPeer from './ListPeer';
import ListMe from './ListMe';
const ParticipantList = ({ advancedMode, peers, setSelectedPeer, selectedPeerName }) => ( const ParticipantList = ({ advancedMode, peers, setSelectedPeer, selectedPeerName }) => (
<div data-component='ParticipantList'> <div data-component='ParticipantList'>
<ul className='list'> <ul className='list'>
<ListMe />
{peers.map((peer) => ( {peers.map((peer) => (
<li <li
key={peer.name} key={peer.name}