Merge branch 'master' into account_sessions

This commit is contained in:
SleepWalker
2016-06-04 15:59:01 +03:00
8 changed files with 33 additions and 229 deletions

2
environments/docker/.env Normal file
View File

@@ -0,0 +1,2 @@
XDEBUG_CONFIG=remote_host=192.168.99.1
PHP_IDE_CONFIG=serverName=docker