Merge remote-tracking branch 'origin/dev' into dev · rey5137/material@58f065c · GitHub

This repository has been archived by the owner on Feb 28, 2024. It is now read-only.

Commit

Merge remote-tracking branch 'origin/dev' into dev

Browse files

Conflicts:
	lib/src/main/java/com/rey/material/widget/Spinner.java

Loading branch information

rey5137 committed May 19, 2015

2 parents 9d989fe + 3737a2e commit 58f065c