Skip to content
Commit 7b3a4834 authored by Natsuki Shimizu's avatar Natsuki Shimizu
Browse files

Merge branch 'develop' into '44-loop-shortcodes' 

# Conflicts:
#   content/about/_index.en.md
parents 64e21889 f1327fff
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