Skip to content
Commit 94fa257d authored by Naoya Ozawa's avatar Naoya Ozawa
Browse files

Merge branch 'develop' into '43-showindex-accordion' 

# Conflicts:
#   config.toml
#   themes/cns_hp_theme/layouts/partials/main_menu.html
parents 8a42f28b 756733de
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