taghir dar modele feedback
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
taghir dar modele feedback
Merge remote-tracking branch 'origin/master'
committing
Merge branch 'master' of github.com:hamed-moghimi/nikbad

Conflicts:
	sales/admin.py
	sales/templates/sales/index.html
sabte name karbar ezafe shod , edit mande
Merge remote-tracking branch 'origin/master'