Merge branch 'nav-active' of github.com:Alex-Code/yii2 into Alex-Code-nav-active
Conflicts: extensions/bootstrap/CHANGELOG.md extensions/bootstrap/Nav.php
Showing
Please register or sign in to comment
Conflicts: extensions/bootstrap/CHANGELOG.md extensions/bootstrap/Nav.php