From 7f94773abbeb2edf28395d9d971d0be03f70f884 Mon Sep 17 00:00:00 2001
From: ivan <ivan@opensupports.com>
Date: Tue, 29 Nov 2016 19:51:37 -0300
Subject: [PATCH] Ivan - Fix conflicts [skip ci]

---
 client/src/app/admin/panel/users/admin-panel-ban-users.js | 2 +-
 client/src/data/languages/en.js                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/app/admin/panel/users/admin-panel-ban-users.js b/client/src/app/admin/panel/users/admin-panel-ban-users.js
index 328fcec2..a368eeaf 100644
--- a/client/src/app/admin/panel/users/admin-panel-ban-users.js
+++ b/client/src/app/admin/panel/users/admin-panel-ban-users.js
@@ -29,7 +29,7 @@ class AdminPanelBanUsers extends React.Component {
             <div className="admin-panel-ban-users row">
                 <Header title={i18n('BAN_USERS')} description={i18n('BAN_USERS_DESCRIPTION')} />
                 <div className="admin-panel-ban-users__email-list col-md-6">
-                    <SearchBox className="admin-panel-ban-users__search" onSearch={this.onSearch.bind(this)} searchOnType/>
+                    <SearchBox className="admin-panel-ban-users__search" onSearch={this.onSearch.bind(this)} searchOnType placeholder={i18n('SEARCH_EMAIL')}/>
                     <Table {...this.getTableProps()} />
                 </div>
                 <div className="admin-panel-ban-users__ban-email col-md-6">
diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js
index 58fe1a1f..da5706d9 100644
--- a/client/src/data/languages/en.js
+++ b/client/src/data/languages/en.js
@@ -82,8 +82,9 @@ export default {
     'NAME': 'Name',
     'SIGNUP_DATE': 'Sign up date',
     'SEARCH_USERS': 'Search users...',
+    'SEARCH_EMAIL': 'Search email...',
     'USER_VIEW_TITLE': 'User #{userId}',
-    
+
     //VIEW DESCRIPTIONS
     'CREATE_TICKET_DESCRIPTION': 'This is a form for creating tickets. Fill the form and send us your issues/doubts/suggestions. Our support system will answer it as soon as possible.',
     'TICKET_LIST_DESCRIPTION': 'Here you can find a list of all tickets you have sent to our support team.',