Fix bad merging

Browse Source

...

This commit is contained in:

Luis

2017-04-29 12:17:38 +02:00

parent b19e4a4e0d

commit 338b265950

4 changed files with 163 additions and 467 deletions

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

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

562

static/js/webslides.js

File diff suppressed because it is too large Load Diff

11

static/js/webslides.min.js vendored

File diff suppressed because one or more lines are too long