Merge branch 'merchants' into 'master'

Fix bug in merchants that breaks jekyll build

See merge request monero-project/monero-site!958
This commit is contained in:
Riccardo Spagni 2018-12-02 18:59:37 +01:00
commit 2f986cb6fd

View file

@ -228,7 +228,7 @@
url: https://koddos.net
- name: INST.US Instagram Service
url: http://inst.us
- name: Man Remade: Personal Development Coaching for Men
- name: "Man Remade: Personal Development Coaching for Men"
url: http://www.manremade.com/
- name: Marcos Aguayo - Programmer and Web Developer
url: http://marcosaguayo.com/