Merge branch 'master' of github.com:hakimel/reveal.js into dev

This commit is contained in:
Hakim El Hattab 2015-06-25 10:02:21 +02:00
commit adf1a24f0a
3 changed files with 7 additions and 11 deletions

View file

@ -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>

View file

@ -7,7 +7,7 @@
"main": "js/reveal.js",
"scripts": {
"test": "grunt test",
"start": ""
"start": "grunt serve"
},
"author": {
"name": "Hakim El Hattab",
@ -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"
}

View file

@ -9,7 +9,7 @@ var staticDir = express.static;
io = io.listen(app);
var opts = {
port: 1948,
port: process.env.PORT || 1948,
baseDir : __dirname + '/../../'
};