diff options
author | David Banham | 2013-03-08 10:29:54 +1100 |
---|---|---|
committer | David Banham | 2013-03-08 10:29:54 +1100 |
commit | 61c229a4f969a0720085c2710f8a7cfd8a12b4a6 (patch) | |
tree | 637eeedce43c63a6aa004d566944ad791b984e7d /fixed.html | |
parent | 26d5febd7f24223900aa50d24d35e610c7c8a334 (diff) | |
parent | 7081f901da553206f746c40c4a0c1b5773697cf2 (diff) |
Merge branch 'master' of https://github.com/hakimel/reveal.js
Conflicts:
README.md
index.html
js/reveal.js
package.json
plugin/speakernotes/client.js
Diffstat (limited to 'fixed.html')
0 files changed, 0 insertions, 0 deletions