Merge branch 'hotfix/loyalty_13'
Merge branch 'develop' of 10.11.0.1:/home/git/git/mobispot
fix
:space_invader: Added .gitattributes
Merge branch 'master' of github.com:bigbag/mobispot-yii
Merge branch 'develop' of github.com:bigbag/mobispot-yii
merge
merge
feature: новый способ подключения акций с проверкой условий в term-flask
Merge branch 'hotfix/loyalty_api' into develop