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

Browse source

# By Chuck C Williams (1) and kiralybalazs (1)
# Via 0xfff
* 'master' of https://github.com/dashpay/dash-website:
  Feature/wallets (#65)
  Update: profile pic of balu (#63)

Conflicts:
	_data/wallets-collection.yml
	_includes/wallet-tile.html
	src/js/wallets.js
	src/scss/_junk-drawer.scss
	wallets/index.html

...

This commit is contained in:

Chuck Williams 2017-01-17 01:18:51 -07:00

parent 5d3388abf2 95a0271475

commit ab8a2d1aff

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

assets/img/team/balu.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 90 KiB After Width:  |  Height:  |  Size: 125 KiB