Merge remote-tracking branch 'origin/master' into use-countdown-hook · ndresx/react-countdown@ffe8a6d · GitHub

Commit

Merge remote-tracking branch 'origin/master' into use-countdown-hook

Browse files

# Conflicts:
#	package.json
#	src/Countdown.test.tsx
#	src/Countdown.tsx

Loading branch information

ndresx committed Oct 24, 2020

2 parents b0d7400 + c909d97 commit ffe8a6d