something
Merge branch 'master' of https://github.com/pooya1361/PizzaShop
message
COMMIT
-
Update .gitignore
exclude .properties
Merge branch 'master' of https://github.com/Narrges/PizzaShop
solve comflicts