Skip to content
Commit 95b0f4c7 authored by François Michonneau's avatar François Michonneau
Browse files

Merge github.com:swcarpentry/styles into upgrade-bootstrap 

Conflicts:
	css/swc-bootstrap.css
	css/swc.css
parents 2f93d5c1 ea5a11d1
Expand all Hide whitespace changes
Inline Side-by-side
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