From 863e34db196653e27564917e0864e3a44001053e Mon Sep 17 00:00:00 2001
From: Schuyler Cebulskie <Gawdl3y@gawdl3y.com>
Date: Thu, 29 Dec 2016 19:21:19 -0500
Subject: [PATCH 1/3] Change branch in contributing guide

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8b56f1c1a..361069497 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ is a great boon to your coding process.
 ## Setup
 To get ready to work on the codebase, please do the following:
 
-1. Fork & clone the repository, and make sure you're on the **indev** branch
+1. Fork & clone the repository, and make sure you're on the **master** branch
 2. Run `npm install`
 3. If you're working on voice, also run `npm install node-opus` or `npm install opusscript`
 4. Code your heart out!

From 9e70d6279fee015aefffebfa7c8c606308ad9142 Mon Sep 17 00:00:00 2001
From: bdistin <bdistin@gmail.com>
Date: Thu, 29 Dec 2016 21:01:18 -0600
Subject: [PATCH 2/3] Fix erroneous docs examples (#1042)

---
 src/structures/Guild.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index acd5b6fde..368269509 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -542,12 +542,12 @@ class Guild {
    * @example
    * // see how many members will be pruned
    * guild.pruneMembers(12, true)
-   *   .then(pruned => console.log(`This will prune ${pruned} people!`);
+   *   .then(pruned => console.log(`This will prune ${pruned} people!`))
    *   .catch(console.error);
    * @example
    * // actually prune the members
    * guild.pruneMembers(12)
-   *   .then(pruned => console.log(`I just pruned ${pruned} people!`);
+   *   .then(pruned => console.log(`I just pruned ${pruned} people!`))
    *   .catch(console.error);
    */
   pruneMembers(days, dry = false) {

From be19a08575c31048030c8b97822a281ac8d79318 Mon Sep 17 00:00:00 2001
From: Schuyler Cebulskie <Gawdl3y@gawdl3y.com>
Date: Thu, 29 Dec 2016 23:12:40 -0500
Subject: [PATCH 3/3] Make Travis builds run for all but blacklisted branches

---
 deploy/deploy.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index cbd644ed9..dabad94b9 100644
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -19,10 +19,8 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
 fi
 
 # Ignore travis checking other branches irrelevant to users
-# Apparently Travis considers tag builds as separate branches so we need to
-# check for that separately
-if [ "$TRAVIS_BRANCH" != "master" -a "$TRAVIS_BRANCH" != "indev" -a "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ]; then
-  echo "deploy.sh: Ignoring push to another branch than master/indev"
+if [ "$TRAVIS_BRANCH" == "gh-pages" -o "$TRAVIS_BRANCH" == "gh-pages-dev" -o "$TRAVIS_BRANCH" == "docs" -o "$TRAVIS_BRANCH" == "webpack" -o "$TRAVIS_BRANCH" == "v8" ]; then
+  echo "deploy.sh: Ignoring push to blacklisted branch"
   build
   exit 0
 fi