# Conflicts: # .travis.yml # docs/guide-es/concept-events.md # docs/guide-ja/concept-events.md # docs/guide-pt-BR/concept-events.md # docs/guide-ru/concept-events.md # docs/guide-zh-CN/concept-events.md # docs/guide/concept-events.md # framework/console/controllers/AssetController.php # framework/web/Application.php # framework/web/UrlManager.php # framework/web/User.php # framework/widgets/ActiveForm.php # tests/framework/base/EventTest.php