From c2494724239eea94cf9210e06b97ec8871bbe493 Mon Sep 17 00:00:00 2001
From: Torjus <torjusti@gmail.com>
Date: Thu, 2 Aug 2018 13:00:27 +0200
Subject: [PATCH] Merge develop

---
 app/lib/components/ParticipantList/ParticipantList.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/lib/components/ParticipantList/ParticipantList.jsx b/app/lib/components/ParticipantList/ParticipantList.jsx
index cf38181..5f56983 100644
--- a/app/lib/components/ParticipantList/ParticipantList.jsx
+++ b/app/lib/components/ParticipantList/ParticipantList.jsx
@@ -5,10 +5,13 @@ import * as appPropTypes from '../appPropTypes';
 import * as stateActions from '../../redux/stateActions';
 import PropTypes from 'prop-types';
 import ListPeer from './ListPeer';
+import ListMe from './ListMe';
 
 const ParticipantList = ({ advancedMode, peers, setSelectedPeer, selectedPeerName }) => (
 	<div data-component='ParticipantList'>
 		<ul className='list'>
+			<ListMe />
+
 			{peers.map((peer) => (
 				<li
 					key={peer.name}