Skip to content
Commit 04e8ec79 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 05e1fa9e 6d6a3dee
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