Commit 9210a283 authored by Matt Evanoff's avatar Matt Evanoff
Browse files

Merge branch '766-Slider-to-control-withdraw_vesting-amount' of... 

Merge branch '766-Slider-to-control-withdraw_vesting-amount' of https://github.com/steemit/condenser into 766-Slider-to-control-withdraw_vesting-amount

# Conflicts:
#	app/components/modules/UserWallet.jsx
parents 62fd72aa 014565f3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment