From 1c1fd8f2102351cfef86a0dc85fe4114f5da09c2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 17 Mar 2017 21:43:46 -0400
Subject: [PATCH 1/2] Limit tests to one per major Python version

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b23c9d8fc..1576da4cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,7 @@ env:
 language: python
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
-  - "3.6"
 install:
   - pip install -r requirements.txt
   - pip install pep8

From 1682de59df31dac6a74d193918a83141577158b4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 20 Mar 2017 14:05:26 -0400
Subject: [PATCH 2/2] Added a footer link to the GitHub wiki

---
 netbox/templates/_base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index 6f0dfced6..0ebc4f5b4 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -295,7 +295,8 @@
                     <p class="text-muted">
                         <i class="fa fa-fw fa-book text-primary"></i> <a href="http://netbox.readthedocs.io/" target="_blank">Docs</a> &middot;
                         <i class="fa fa-fw fa-cloud text-primary"></i> <a href="{% url 'django.swagger.base.view' %}">API</a> &middot;
-                        <i class="fa fa-fw fa-code text-primary"></i> <a href="https://github.com/digitalocean/netbox">Code</a>
+                        <i class="fa fa-fw fa-code text-primary"></i> <a href="https://github.com/digitalocean/netbox">Code</a> &middot;
+                        <i class="fa fa-fw fa-support text-primary"></i> <a href="https://github.com/digitalocean/netbox/wiki">Help</a>
                     </p>
                 </div>
             </div>