From d4e1f1af7ad5a3b1b9fbba64fd94ae55d5555360 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 18 Feb 2019 17:05:48 +0000
Subject: [PATCH 1/2] Fix cleanup script not to remove extracted/bundles
 directories (#8764)

---
 scripts/cleanup.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
index 6c174b3a663..3e7923a5c1d 100755
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -9,8 +9,11 @@ live=`dirname $(readlink -f "$HOME/live")`
 # currently live bundle (just the name of the bundle)
 live_bundle=`grep 'script src="bundles' live/index.html | sed -e 's#.*bundles/##' -e 's#/.*##'`
 
-# clean up 'extracted': find things which are older than 7 days, exclude the current live one, and remove
-find $HOME/extracted -maxdepth 1 -type d -ctime +7 \! -path "$live" -exec rm -r {} \;
+# clean up 'extracted': find things which are older than 7 days, exclude the
+# current live one, and remove
+find $HOME/extracted -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+     \! -path "$live" -exec rm -r {} \;
 
 # clean up 'bundles': ditto
-find $HOME/bundles -maxdepth 1 -type d -ctime +7 \! -name "$live_bundle" -exec rm -r {} \;
+find $HOME/bundles -mindepth 1 -maxdepth 1 -type d -ctime +7 \
+     \! -name "$live_bundle" -exec rm -r {} \;

From f9be0bfb2ee01b5f5f93769442ec2612c7d98ba0 Mon Sep 17 00:00:00 2001
From: Tom Lant <lampholder@gmail.com>
Date: Wed, 27 Feb 2019 14:06:00 +0000
Subject: [PATCH 2/2] Update issue templates

---
 .github/ISSUE_TEMPLATE/redesign_issue.md | 32 ------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/redesign_issue.md

diff --git a/.github/ISSUE_TEMPLATE/redesign_issue.md b/.github/ISSUE_TEMPLATE/redesign_issue.md
deleted file mode 100644
index 162d0a12852..00000000000
--- a/.github/ISSUE_TEMPLATE/redesign_issue.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Redesign Issue
-about: Bugs, feedback or feature requests specifically associated with the Redesign
-  project (https://riot.im/experimental)
-title: ''
-labels: redesign
-assignees: ''
-
----
-
-<!-- Thanks for providing feedback on the redesign! By filling out the sections with your information, you will help the us to process your issue.
--->
-
-- **Browser**: Chrome, Safari, Firefox? which version?
-- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
-
-### Description
-
-Describe here the problem that you are experiencing, or the feature you are requesting.
-Include screenshots if possible: you can drag and drop images below.
-
-### Steps to reproduce
-
-- For bugs, list the steps
-- that reproduce the bug
-- using hyphens as bullet points
-
-Describe how what happens differs from what you expected.
-
-Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
-link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
-file a bug here too! -->