From 0996644512a897af07bb48d5b3489ff4af80ccb2 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 25 Jan 2017 11:09:25 -0500
Subject: [PATCH] Added a polyfill for Reflect to support Android devices
 (#186)

* Added a polyfill for Reflect to support Android devices

* Added harmony-reflect to NOTICE.txt
---
 NOTICE.txt        | 41 +++++++++++++++++++++++++++++++++++++++++
 app/mattermost.js |  1 +
 package.json      |  1 +
 3 files changed, 43 insertions(+)

diff --git a/NOTICE.txt b/NOTICE.txt
index 9eef79035..49031be3b 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -49,6 +49,47 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ---
 
+## harmony-reflect
+
+This product contains a modified portion of 'harmony-reflect', a shim for ECMAScript 6 Reflect and Proxy objects.
+
+* HOMEPAGE:
+  * https://github.com/tvcutsem/harmony-reflect
+
+* LICENSE:
+
+Copyright (C) 2011-2014 Software Languages Lab, Vrije Universiteit Brussel
+Copyright (C) 2015 Tom Van Cutsem
+
+This code is dual-licensed under both the Apache License and the MPL
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Version: MPL 1.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+  http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+---
+
 ## intl
 
 This product contains a modified portion of 'Intl.js', to bring long overdue localization methods to ECMAScript implementations by Andy Earnshaw.
diff --git a/app/mattermost.js b/app/mattermost.js
index 62ea36b56..debabbd91 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -1,6 +1,7 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+import 'harmony-reflect';
 import React from 'react';
 import {Provider} from 'react-redux';
 
diff --git a/package.json b/package.json
index 9e55663ad..48812fa47 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "deep-equal": "1.0.1",
+    "harmony-reflect": "1.5.1",
     "intl": "1.2.5",
     "isomorphic-fetch": "2.2.1",
     "react": "15.4.1",