From 5dd2dd9f0b2ca13e2e1a44375cc5b7d6606d6b1a Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Wed, 10 Jun 2015 18:23:20 +0100
Subject: Allows to specify PORT from env on multiplex plugin

---
 plugin/multiplex/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/multiplex/index.js b/plugin/multiplex/index.js
index 6f5d8b1..af058ed 100644
--- a/plugin/multiplex/index.js
+++ b/plugin/multiplex/index.js
@@ -9,7 +9,7 @@ var staticDir	= express.static;
 io				= io.listen(app);
 
 var opts = {
-	port: 1948,
+	port: process.env.PORT || 1948,
 	baseDir : __dirname + '/../../'
 };
 
-- 
cgit v1.2.3


From 018ca774061846820b4289c49f0fb6033cb3ef07 Mon Sep 17 00:00:00 2001
From: Jason Karns <jason.karns@gmail.com>
Date: Tue, 16 Jun 2015 10:39:58 -0400
Subject: enabling launching presentation with npm-start

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 201c6bf..4b26ade 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "main": "js/reveal.js",
   "scripts": {
     "test": "grunt test",
-    "start": ""
+    "start": "grunt serve"
   },
   "author": {
     "name": "Hakim El Hattab",
-- 
cgit v1.2.3


From 071a523f423b2484eadf0082850aa172c9a9ad52 Mon Sep 17 00:00:00 2001
From: Jason Karns <jason.karns@gmail.com>
Date: Tue, 16 Jun 2015 10:43:20 -0400
Subject: `licenses` field is deprecated

the `licenses` field in package.json is deprecated. https://docs.npmjs.com/files/package.json#license

The `license` field is the recommended field and expects an SPDX expression.
---
 package.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 201c6bf..c55021c 100644
--- a/package.json
+++ b/package.json
@@ -40,10 +40,6 @@
     "grunt": "~0.4.0",
     "node-sass": "~0.9.3"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/hakimel/reveal.js/blob/master/LICENSE"
-    }
-  ]
+  
+  "license": "MIT"
 }
-- 
cgit v1.2.3


From be91cc61185f5121e55751fffe7596d092eea5d9 Mon Sep 17 00:00:00 2001
From: Jason Karns <jason.karns@gmail.com>
Date: Sat, 20 Jun 2015 10:04:39 -0400
Subject: broken <table> html in demo deck

---
 index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index d4adcf6..869ccb4 100644
--- a/index.html
+++ b/index.html
@@ -277,17 +277,17 @@ function linkify( selector ) {
 								<td>Apples</td>
 								<td>$1</td>
 								<td>7</td>
-							<tr>
+							</tr>
 							<tr>
 								<td>Lemonade</td>
 								<td>$2</td>
 								<td>18</td>
-							<tr>
+							</tr>
 							<tr>
 								<td>Bread</td>
 								<td>$3</td>
 								<td>2</td>
-							<tr>
+							</tr>
 						</tbody>
 					</table>
 				</section>
-- 
cgit v1.2.3