user auth setup
user auth setup
user auth setup
Backend Development1 cont.
Complaint form
Merge branch 'bencopy'

an empty message aborts
Merge branch 'master' of https://github.com/sirantho20/voiceout
new changes
Merge branch 'bencopy'
update to migrations
Merge branch 'bencopy'
Merge branch 'bencopy'

Conflicts:
	common/config/main.php
	composer.json
	composer.lock
	frontend/controllers/CompanyController.php
	frontend/views/layouts/main.php
	vendor/autoload.php
	vendor/composer/autoload_psr4.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	vendor/kartik-v/bootstrap-fileinput/CHANGE.md
	vendor/kartik-v/bootstrap-fileinput/README.md
	vendor/kartik-v/bootstrap-fileinput/bower.json
	vendor/kartik-v/bootstrap-fileinput/css/fileinput.css
	vendor/kartik-v/bootstrap-fileinput/css/fileinput.min.css
	vendor/kartik-v/bootstrap-fileinput/js/fileinput.js
	vendor/kartik-v/bootstrap-fileinput/js/fileinput.min.js
	vendor/kartik-v/yii2-widgets/CHANGE.md
	vendor/kartik-v/yii2-widgets/README.md
	vendor/kartik-v/yii2-widgets/widgets/Select2.php
	vendor/twbs/bootstrap/Gruntfile.js
	vendor/twbs/bootstrap/dist/css/bootstrap-theme.css.map
	vendor/twbs/bootstrap/dist/css/bootstrap-theme.min.css
	vendor/twbs/bootstrap/dist/css/bootstrap.css.map
	vendor/twbs/bootstrap/dist/css/bootstrap.min.css
	vendor/twbs/bootstrap/docs/_includes/components/alerts.html
	vendor/twbs/bootstrap/docs/_includes/js/dropdowns.html
	vendor/twbs/bootstrap/docs/assets/js/customize.min.js
	vendor/twbs/bootstrap/docs/assets/js/raw-files.min.js
	vendor/twbs/bootstrap/docs/dist/css/bootstrap-theme.css.map
	vendor/twbs/bootstrap/docs/dist/css/bootstrap-theme.min.css
	vendor/twbs/bootstrap/docs/dist/css/bootstrap.css.map
	vendor/twbs/bootstrap/docs/dist/css/bootstrap.min.css
	vendor/twbs/bootstrap/docs/examples/theme/index.html
	vendor/twbs/bootstrap/js/button.js
	vendor/yiisoft/extensions.php
	vendor/yiisoft/yii2-gii/generators/extension/default/composer.json
	vendor/yiisoft/yii2/CHANGELOG.md
	vendor/yiisoft/yii2/UPGRADE.md
	vendor/yiisoft/yii2/db/mssql/QueryBuilder.php
	vendor/yiisoft/yii2/db/oci/Schema.php
	vendor/yiisoft/yii2/filters/HttpCache.php
	vendor/yiisoft/yii2/log/DbTarget.php
	vendor/yiisoft/yii2/messages/config.php
	vendor/yiisoft/yii2/requirements/requirements.php
master changes
mergin branch and master
Merge branch 'master' of https://github.com/sirantho20/voiceout

Conflicts:
	common/config/main.php
	composer.json
	composer.lock
	frontend/views/layouts/main.php
	vendor/autoload.php
	vendor/composer/autoload_psr4.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	vendor/kartik-v/bootstrap-fileinput/CHANGE.md
	vendor/kartik-v/bootstrap-fileinput/README.md
	vendor/kartik-v/bootstrap-fileinput/bower.json
	vendor/kartik-v/bootstrap-fileinput/css/fileinput.css
	vendor/kartik-v/bootstrap-fileinput/css/fileinput.min.css
	vendor/kartik-v/bootstrap-fileinput/js/fileinput.js
	vendor/kartik-v/bootstrap-fileinput/js/fileinput.min.js
	vendor/kartik-v/yii2-widgets/CHANGE.md
	vendor/kartik-v/yii2-widgets/README.md
	vendor/kartik-v/yii2-widgets/widgets/Select2.php
	vendor/twbs/bootstrap/Gruntfile.js
	vendor/twbs/bootstrap/dist/css/bootstrap-theme.css.map
	vendor/twbs/bootstrap/dist/css/bootstrap-theme.min.css
	vendor/twbs/bootstrap/dist/css/bootstrap.css.map
	vendor/twbs/bootstrap/dist/css/bootstrap.min.css
	vendor/twbs/bootstrap/docs/_includes/components/alerts.html
	vendor/twbs/bootstrap/docs/_includes/js/dropdowns.html
	vendor/twbs/bootstrap/docs/assets/js/customize.min.js
	vendor/twbs/bootstrap/docs/assets/js/raw-files.min.js
	vendor/twbs/bootstrap/docs/dist/css/bootstrap-theme.css.map
	vendor/twbs/bootstrap/docs/dist/css/bootstrap-theme.min.css
	vendor/twbs/bootstrap/docs/dist/css/bootstrap.css.map
	vendor/twbs/bootstrap/docs/dist/css/bootstrap.min.css
	vendor/twbs/bootstrap/docs/examples/theme/index.html
	vendor/twbs/bootstrap/js/button.js
	vendor/yiisoft/extensions.php
	vendor/yiisoft/yii2-gii/generators/extension/default/composer.json
	vendor/yiisoft/yii2/CHANGELOG.md
	vendor/yiisoft/yii2/UPGRADE.md
	vendor/yiisoft/yii2/db/mssql/QueryBuilder.php
	vendor/yiisoft/yii2/db/oci/Schema.php
	vendor/yiisoft/yii2/filters/HttpCache.php
	vendor/yiisoft/yii2/log/DbTarget.php
	vendor/yiisoft/yii2/messages/config.php
	vendor/yiisoft/yii2/requirements/requirements.php
fixes
changes
fixed commit errors
fixed changes in master: