merge master into dev

Browse Source

edit

Hakim El Hattab 2014-03-25 21:37:51 +01:00

parent eef1636fd7 9da952fea3

commit 17d8f0b77c

2 changed files with 16 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6

js/reveal.min.js vendored

View File

File diff suppressed because one or more lines are too long