aboutsummaryrefslogtreecommitdiff
path: root/plugin/multiplex
diff options
context:
space:
mode:
authorDavid Banham <david@banham.id.au>2013-03-08 10:29:54 +1100
committerDavid Banham <david@banham.id.au>2013-03-08 10:29:54 +1100
commit61c229a4f969a0720085c2710f8a7cfd8a12b4a6 (patch)
tree637eeedce43c63a6aa004d566944ad791b984e7d /plugin/multiplex
parent26d5febd7f24223900aa50d24d35e610c7c8a334 (diff)
parent7081f901da553206f746c40c4a0c1b5773697cf2 (diff)
downloadfosdem-2018-presentation-61c229a4f969a0720085c2710f8a7cfd8a12b4a6.tar
fosdem-2018-presentation-61c229a4f969a0720085c2710f8a7cfd8a12b4a6.tar.gz
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 'plugin/multiplex')
0 files changed, 0 insertions, 0 deletions