From 19041fed04acbdea8ea7d2c2c864dc8fa8848f95 Mon Sep 17 00:00:00 2001
From: Brigitta Sipocz <b.sipocz@gmail.com>
Date: Wed, 6 Jun 2018 15:22:38 +0100
Subject: [PATCH 1/2] Update astropy timeline

To reflect the roadmap here: https://github.com/astropy/astropy-APEs/blob/master/APE10.rst
---
 site.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/site.js b/site.js
index bc584fd..a3def72 100644
--- a/site.js
+++ b/site.js
@@ -159,11 +159,10 @@ $(document).ready(function (){
       {content: '1.2', start: '2016-06-23', end: '2016-12-16', py2:true},
       {content: '1.3', start: '2016-12-16', end: '2017-06-01', py2:true},
       {content: '2.0 LTS', start: '2017-06-01', end: '2019-12-31', py2:true},
-      {content: '3.0', start: '2017-12-01', end: '2018-06-01'},
-      {content: '3.1', start: '2018-06-01', end: '2018-12-01'},
-      {content: '3.2', start: '2018-12-01', end: '2019-06-01'},
-      {content: '3.3', start: '2019-06-01', end: '2019-12-01'},
-      {content: '4.0 LTS', start: '2019-12-01', end: '2021-12-01'},
+      {content: '3.0', start: '2018-02-19', end: '2018-11-30'},
+      {content: '3.1', start: '2018-11-30', end: '2019-05-01'},
+      {content: '3.2', start: '2019-05-01', end: '2019-06-01'},
+      {content: '4.0 LTS', start: '2019-11-30', end: '2021-12-01'},
     ],
     'osBrain':[
       {content: '0.x', start: '2016-07-01', end: '2021-12-16'},

From 86e2c25b19dd92af0dadc613ac9b9ec1d30424a0 Mon Sep 17 00:00:00 2001
From: Brigitta Sipocz <b.sipocz@gmail.com>
Date: Wed, 6 Jun 2018 19:41:42 +0100
Subject: [PATCH 2/2] fix typo

---
 site.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site.js b/site.js
index a3def72..ba120a6 100644
--- a/site.js
+++ b/site.js
@@ -161,7 +161,7 @@ $(document).ready(function (){
       {content: '2.0 LTS', start: '2017-06-01', end: '2019-12-31', py2:true},
       {content: '3.0', start: '2018-02-19', end: '2018-11-30'},
       {content: '3.1', start: '2018-11-30', end: '2019-05-01'},
-      {content: '3.2', start: '2019-05-01', end: '2019-06-01'},
+      {content: '3.2', start: '2019-05-01', end: '2019-11-30'},
       {content: '4.0 LTS', start: '2019-11-30', end: '2021-12-01'},
     ],
     'osBrain':[