diff options
| author | Michael Kühnel | 2012-10-24 17:48:50 +0200 |
|---|---|---|
| committer | Michael Kühnel | 2012-10-24 17:48:50 +0200 |
| commit | 5af915adaf0f03ea936323e827e86fab6b0bb4e9 (patch) | |
| tree | 0e72e9c726ed96105ccc3ef7364ee782bf412306 /lib | |
| parent | aefe981040ea8c5c7875d9da1ac860def44a19e8 (diff) | |
| parent | 379f5d38ff8c66c10c22a0a18227b481e945dc02 (diff) | |
Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server
Conflicts:
js/reveal.min.js
Need to generate a new minified version afterwards.
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions