From 383cddd3d14107fabea28e09f5f9401623cd19d5 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 28 Apr 2016 10:56:19 -0400
Subject: Don't return error if already part of channel being joined (#2814)

---
 i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 4b67d8c78..e8e20a12a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2851,6 +2851,10 @@
     "id": "store.sql_channel.get_for_export.app_error",
     "translation": "We couldn't get all the channels"
   },
+  {
+    "id": "store.sql_channel.get_member.missing.app_error",
+    "translation": "No channel member found for that user id and channel id"
+  },
   {
     "id": "store.sql_channel.get_member.app_error",
     "translation": "We couldn't get the channel member"
-- 
cgit v1.2.3-1-g7c22