Commit 45346a1c authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3/labCards.assets!1
parents a06857b0 1072cd07
*.aux
*.log
*.out
*.pdf
*.gz
*.fdb_latexmk
*.fls
_site
.sass-cache
.jekyll-metadata
Gemfile.lock
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment