Changes
Added
Finish static pages
Changes
merge commit
Merge branch 'static-pages'