From 01d2582408101fc6758bc21984c4a576d56d8961 Mon Sep 17 00:00:00 2001
From: Kylie Stewart <kylieastewart@gmail.com>
Date: Wed, 31 Jul 2019 08:50:50 -0600
Subject: [PATCH 1/3] Add bulletStyle types

---
 index.d.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index a9b94d79f..ecbe04173 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -19,6 +19,16 @@ declare module 'spectacle' {
     | 'flex-end center'
     | 'flex-end flex-end';
 
+  /**
+   * Bullet Style Types for Spectacle
+   */
+  type bulletStyleType =
+    | 'arrow'
+    | 'classicCheck'
+    | 'cross'
+    | 'greenCheck'
+    | 'star';
+
   /**
    * Animation Types for Spectacle
    */
@@ -280,9 +290,13 @@ declare module 'spectacle' {
 
   class Link extends React.Component<LinkProps> {}
 
-  class List extends React.Component<BaseProps> {}
+  class List extends React.Component<BaseProps> {
+    bulletStyle?: bulletStyleType;
+  }
 
-  class ListItem extends React.Component<BaseProps> {}
+  class ListItem extends React.Component<BaseProps> {
+    bulletStyle?: bulletStyleType;
+  }
 
   class Markdown extends React.Component<MarkdownProps> {}
 

From 9e2767916825877343ea2380faae676915d6db0c Mon Sep 17 00:00:00 2001
From: Kylie Stewart <kylieastewart@gmail.com>
Date: Wed, 31 Jul 2019 08:58:55 -0600
Subject: [PATCH 2/3] Fix ListProps type

---
 index.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index ecbe04173..acbfb7abb 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -222,6 +222,10 @@ declare module 'spectacle' {
     target?: targetType;
   }
 
+  interface ListProps extends BaseProps {
+    bulletStyle?: bulletStyleType;
+  }
+
   interface MarkdownProps {
     mdastConfig?: { [key: string]: number | string };
     source?: string;
@@ -290,13 +294,9 @@ declare module 'spectacle' {
 
   class Link extends React.Component<LinkProps> {}
 
-  class List extends React.Component<BaseProps> {
-    bulletStyle?: bulletStyleType;
-  }
+  class List extends React.Component<ListProps> {}
 
-  class ListItem extends React.Component<BaseProps> {
-    bulletStyle?: bulletStyleType;
-  }
+  class ListItem extends React.Component<ListProps> {}
 
   class Markdown extends React.Component<MarkdownProps> {}
 

From 42849db02d134fb282723cb8c8a688ad72e18a53 Mon Sep 17 00:00:00 2001
From: Kylie Stewart <kylieastewart@gmail.com>
Date: Wed, 31 Jul 2019 09:00:09 -0600
Subject: [PATCH 3/3] Add new COC contact email

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8289eed72..b78f3573f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -106,7 +106,7 @@ further defined and clarified by project maintainers.
 ### Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at emma.brillhart@formidable.com. All
+reported by contacting the project team at coc@formidable.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.