Skip to content
Commit 8b70a42e authored by Natsuki Shimizu's avatar Natsuki Shimizu
Browse files

Merge branch 'develop' into 'draft_50_UTlogo' 

# Conflicts:
#   themes/cns_hp_theme/layouts/partials/header.html
#   themes/cns_hp_theme/static/css/header.css
parents 1c476182 dc6dc1a6
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