Commit 2f986cb6 authored by Riccardo Spagni's avatar Riccardo Spagni

Merge branch 'merchants' into 'master'

Fix bug in merchants that breaks jekyll build

See merge request monero-project/monero-site!958
parents 74271d76 a8e14520
Pipeline #43 failed with stages