Skip to content
Commit 66cb42ae 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
#   themes/cns_hp_theme/layouts/shortcodes/postcards.html
parents e6bc27f2 325aaf9a
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