Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

2

2015-12-uni-ffm
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

5af915ad

Commit 5af915ad authored 12 years ago by Michael Kühnel

Downloads
- Plain 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.

parents aefe9810 379f5d38

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 2 additions, 0 deletions

README.md
js/reveal.js 2 additions, 0 deletions

js/reveal.js
js/reveal.min.js 3 additions, 78 deletions

js/reveal.min.js
plugin/notes-server/client.js 21 additions, 2 deletions

plugin/notes-server/client.js
plugin/notes-server/index.js 4 additions, 1 deletion

plugin/notes-server/index.js
plugin/notes-server/notes.html 18 additions, 7 deletions

plugin/notes-server/notes.html

with 50 additions and 88 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment