From 268d6f559044551aeea49c1c967d713335798b4c Mon Sep 17 00:00:00 2001
From: joates <github@joat.es>
Date: Wed, 1 Oct 2014 19:17:14 +0100
Subject: [PATCH] v1.1.0: added nav link to code of conduct document

---
 html/index.html | 1 +
 package.json    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/index.html b/html/index.html
index 91b250a..7e7045a 100644
--- a/html/index.html
+++ b/html/index.html
@@ -19,6 +19,7 @@
     <div class="span3 leftCol">
       <ul class="nav nav-list">
         <li><a href="#"><i class="icon-chevron-right"></i> SquatConf</a></li>
+        <li><a href="https://github.com/squatconf/organisation/blob/master/code_of_conduct.md#squatconf-code-of-conduct"><i class="icon-chevron-right"></i> Code of Conduct</a></li>
       </ul>
       <br />
 
diff --git a/package.json b/package.json
index 1dac9e1..b9a4821 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "squatconf-web",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "website for the squatConf conference",
   "main": "server.js",
   "scripts": {