From e3b764c914b012db989c8efb652ce6962f294a67 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 10 Jul 2018 23:40:23 -0700
Subject: [PATCH 1/2] Update authors for release 3.0

---
 .mailmap   | 21 +++++++++++++++++++--
 AUTHORS.md | 18 +++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 774aa4174c3..79e90f32785 100644
--- a/.mailmap
+++ b/.mailmap
@@ -163,7 +163,7 @@ Rostislav Galimsky  <rostgal@gmail.com>
 Richard Knoll <riknoll@users.noreply.github.com> Richard Knoll <riknoll@microsoft.com>
 Richard Karmazín  <richard@karmazin.cz>
 Rowan Wyborn <rwyborn@internode.on.net>
-Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com> Ryan Cavanaugh <ryan.cavanaugh@microsoft.com> Ryan Cavanaugh <ryanca@microsoft.com>
+Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com> Ryan Cavanaugh <ryan.cavanaugh@microsoft.com> Ryan Cavanaugh <ryanca@microsoft.com> Ryan Cavanaugh  <the.ryan.cavanaugh@gmail.com>
 Ryohei Ikegami <iofg2100@gmail.com>
 Sarangan Rajamanickam <sarajama@microsoft.com>
 Sébastien Arod <sebastien.arod@gmail.com>
@@ -340,4 +340,21 @@ EcoleKeine  <Ecole_k@qq.com> # Ecole Keine
 Khải  <hvksmr1996@gmail.com>
 rhysd  <lin90162@yahoo.co.jp> # @rhysd
 Zen  <843968788@qq.com> Zzzen  <843968788@qq.com> # @Zzzen
-bluelovers  <codelovers@users.sourceforge.net> # @bluelovers
\ No newline at end of file
+bluelovers  <codelovers@users.sourceforge.net> # @bluelovers
+Dan Freeman  <dfreeman@salsify.com>
+David Sherret  <dsherret@gmail.com>
+David Staheli  <dastahel@microsoft.com>
+Elizabeth Dinella  <elizabeth.a.dinella@gmail.com>
+John Doe  <github.john.doe@outlook.com>
+Kevin Gibbons  <kevin@shapesecurity.com>
+Markus Johnsson  <markus.johnsson@infviz.com>
+Martin Probst  <martin@probst.io>
+Mateusz Burzyński  <mateuszburzynski@gmail.com>
+Steven  <steven@ceriously.com> # @styfle
+Pi Lanningham  <pi.lanningham@gmail.com>
+Sam Bostock  <sam.bostock@shopify.com>
+Vimal Raghubir  <vraghubir0418@gmail.com>
+Vyacheslav Pukhanov  <vyacheslav.pukhanov@gmail.com>
+dangoo  <daniel.gooss@sinnerschrader.com> # Daniel Gooss
+krk  <keremkat@gmail.com> # Kerem Kat
+micnic  <micnic90@gmail.com> # Nicu Micleușanu
diff --git a/AUTHORS.md b/AUTHORS.md
index 0c31c45e2ed..2ee14e49b41 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -74,7 +74,9 @@ TypeScript is authored by:
 * Dafrok Zhang
 * Dahan Gong
 * Dan Corder
+* Dan Freeman 
 * Dan Quirk
+* Daniel Gooss
 * Daniel Hollocher
 * Daniel Król 
 * Daniel Lehenbauer
@@ -82,7 +84,9 @@ TypeScript is authored by:
 * David Kmenta
 * David Li
 * David Sheldrick 
+* David Sherret 
 * David Souther
+* David Staheli 
 * Denis Nedelyaev
 * Derek P Sifford 
 * Dhruv Rajvanshi 
@@ -96,6 +100,7 @@ TypeScript is authored by:
 * @e-cloud
 * Ecole Keine
 * Elisée Maurer
+* Elizabeth Dinella 
 * Emilio García-Pumarino
 * Eric Grube 
 * Eric Tsang
@@ -161,6 +166,7 @@ TypeScript is authored by:
 * Joel Day 
 * Joey Wilson
 * Johannes Rieken
+* John Doe 
 * John Vilk
 * Jonathan Bond-Caron
 * Jonathan Park
@@ -184,7 +190,9 @@ TypeScript is authored by:
 * Keith Mashinter
 * Ken Howard
 * Kenji Imamula
+* Kerem Kat
 * Kevin Donnelly 
+* Kevin Gibbons 
 * Kevin Lang 
 * Khải 
 * Kitson Kelly 
@@ -201,10 +209,13 @@ TypeScript is authored by:
 * Manish Giri
 * Marin Marinov
 * Marius Schulz 
+* Markus Johnsson 
 * Martin Hiller 
+* Martin Probst 
 * Martin Vseticka
 * Martyn Janes 
 * Masahiro Wakame
+* Mateusz Burzyński 
 * Matt Bierner 
 * Matt McCutchen
 * Matt Mitchell 
@@ -223,10 +234,10 @@ TypeScript is authored by:
 * Mohamed Hegazy
 * Mohsen Azimi 
 * Myles Megyesi 
-* Natalie Coley
 * Nathan Shively-Sanders
 * Nathan Yee
 * Nicolas Henry
+* Nicu Micleușanu
 * @nieltg
 * Nima Zahedi
 * Noah Chen 
@@ -248,6 +259,7 @@ TypeScript is authored by:
 * Peter Burns
 * Philip Bulley
 * Philippe Voinov 
+* Pi Lanningham 
 * Piero Cangianiello
 * @piloopin
 * Prayag Verma
@@ -270,6 +282,7 @@ TypeScript is authored by:
 * Rowan Wyborn
 * Ryan Cavanaugh
 * Ryohei Ikegami
+* Sam Bostock 
 * Sam El-Husseini 
 * Sarangan Rajamanickam
 * Sean Barag 
@@ -290,6 +303,7 @@ TypeScript is authored by:
 * Stas Vilchik 
 * Stephan Ginthör 
 * Steve Lucco
+* @styfle
 * Sudheesh Singanamalla 
 * Sébastien Arod
 * @T18970237136
@@ -316,8 +330,10 @@ TypeScript is authored by:
 * Vidar Tonaas Fauske
 * Viktor Zozulyak
 * Vilic Vane
+* Vimal Raghubir 
 * Vladimir Kurchatkin 
 * Vladimir Matveev
+* Vyacheslav Pukhanov 
 * Wenlu Wang 
 * Wesley Wigham
 * William Orr 

From f66c7dbba25699eb3604f01f051810adc026a361 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 10 Jul 2018 23:41:09 -0700
Subject: [PATCH 2/2] Add release-3.0 to supported branches

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index d7610ed7603..9479fffe763 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ branches:
   - release-2.7
   - release-2.8
   - release-2.9
+  - release-3.0
 
 install:
   - npm uninstall typescript --no-save