diff options
| author | Chris Lawrence | 2014-11-30 21:26:17 -0500 |
|---|---|---|
| committer | Chris Lawrence | 2014-11-30 21:26:17 -0500 |
| commit | 54082a8d76e8c12bb5b424f7ff21644632f054aa (patch) | |
| tree | 56a44e97fb3ec7640296c6ea783b1f5f227ae69e | |
| parent | 09de278be0b969409b9967ea4a3d9c06d25fe4c6 (diff) | |
| parent | 57977e29239a1115ddfd673fc24f86080203f6d7 (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 20 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | package.json | 2 |
4 files changed, 23 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 2d6cd8f..165d9ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js node_js: - - 0.8 + - 0.10 before_script: - npm install -g grunt-cli
\ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..fd37e5a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,20 @@ +## Contributing + +Please keep the [issue tracker](http://github.com/hakimel/reveal.js/issues) limited to **bug reports**, **feature requests** and **pull requests**. + + +### Personal Support +If you have personal support or setup questions the best place to ask those are [StackOverflow](http://stackoverflow.com/questions/tagged/reveal.js). + + +### Bug Reports +When reporting a bug make sure to include information about which browser and operating system you are on as well as the necessary steps to reproduce the issue. If possible please include a link to a sample presentation where the bug can be tested. + + +### Pull Requests +- Should follow the coding style of the file you work in, most importantly: + - Tabs to indent + - Single-quoted strings +- Should be made towards the **dev branch** +- Should be submitted from a feature/topic branch (not your master) +- Should not include the minified **reveal.min.js** or **reveal.min.css** files @@ -1,4 +1,4 @@ -# reveal.js [](https://travis-ci.org/hakimel/reveal.js) +# reveal.js [](https://travis-ci.org/hakimel/reveal.js) A framework for easily creating beautiful presentations using HTML. [Check out the live demo](http://lab.hakim.se/reveal-js/). diff --git a/package.json b/package.json index 5debdd2..7349037 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "url": "git://github.com/hakimel/reveal.js.git" }, "engines": { - "node": "~0.8.0" + "node": "~0.10.0" }, "dependencies": { "underscore": "~1.5.1", |