joshua/dash-website
1
0
Fork 0
mirror of https://github.com/seigler/dash-website synced 2025-07-27 23:36:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'chuckwilliams37/master' of https://github.com/dashpay/dash-website into chuckwilliams37/master

Browse source 
* 'chuckwilliams37/master' of https://github.com/dashpay/dash-website:
  2 news posts
  new merchant
  edit fixed
  2 new merchants
  new merchant
  edit fixed
  2 new merchants
  Team edit
  Updated Team - Changed to official dash email
  fixed all footer
  3 news posts
  renamed community page
  fixed kiosk buttons
  another team edit
  another team edit
  fixed team order
  fixed team order
  2 new merchants
  2 new merchants
This commit is contained in:
Chuck Williams 2017-04-05 22:56:16 -06:00
commit d6385d9edb
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
_data/merchants-stores.yml
View file

@ -129,10 +129,6 @@
url: https://mywabo.com url: https://mywabo.com
image: Wabo.png image: Wabo.png
<<<<<<< HEAD
=======
>>>>>>> ccee525... new merchant
- name: Buy with Dash - name: Buy with Dash
title: Buy with Dash title: Buy with Dash
url: http://www.buywithdash.org url: http://www.buywithdash.org