change commit
change commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	life
Revert "change commit"

This reverts commit e8dae84adb38219e1e8ad0adf767b17a016dda20.

Changes to be committed:
	modified:   app/src/main/java/com/project/bluepandora/donatelife/adapter/AboutAdapter.java
	new file:   app/src/main/java/com/project/bluepandora/donatelife/adapter/BloodSpinnerAdapter.java
	new file:   app/src/main/java/com/project/bluepandora/donatelife/adapter/DistrictSpinnerAdapter.java
	new file:   app/src/main/java/com/project/bluepandora/donatelife/adapter/HospitalSpinnerAdapter.java
	modified:   app/src/main/java/com/project/bluepandora/donatelife/adapter/ProfileDetailsAdapter.java
	modified:   app/src/main/java/com/project/bluepandora/donatelife/fragments/FeedFragment.java
	modified:   app/src/main/java/com/project/bluepandora/donatelife/fragments/LogInFragment.java
	modified:   app/src/main/java/com/project/bluepandora/donatelife/fragments/RegistrationCompleteFragment.java
	modified:   app/src/main/java/com/project/bluepandora/donatelife/fragments/RequestFragment.java
	modified:   app/src/main/res/layout/fragment_signin.xml
	modified:   app/src/main/res/values-bn/plurals.xml
	modified:   app/src/main/res/values-bn/strings.xml
	modified:   app/src/main/res/values/plurals.xml
	modified:   app/src/main/res/values/strings.xml
change commit