fix conflicts
Merge branch 'dev' of https://github.com/rutrader/alfa-forex into tmp
Merge branch 'dev' of https://github.com/rutrader/alfa-forex into tmp
tmp revision
fix errors
dump.sql
Merge branch 'tmp' of https://github.com/rutrader/alfa-forex into tmp
notices
fix conflicts, errors, notices
ignore config.php
ignore web.php
release on test-server
Merge branch 'tmp' of https://github.com/rutrader/alfa-forex into tmp
change db-password