maryam taghir dar product-detail
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.sqlite3
Merge remote-tracking branch 'origin/master'
maryam product detail done