Merge branch 'release-2.3'
Conflicts: themes/bootstrap3/js/common.js
Showing
- themes/bootprint3/css/compiled.css 1 addition, 1 deletionthemes/bootprint3/css/compiled.css
- themes/bootstrap3/css/compiled.css 1 addition, 1 deletionthemes/bootstrap3/css/compiled.css
- themes/bootstrap3/js/common.js 25 additions, 31 deletionsthemes/bootstrap3/js/common.js
- themes/bootstrap3/js/vendor/typeahead.js 2 additions, 8 deletionsthemes/bootstrap3/js/vendor/typeahead.js
- themes/bootstrap3/less/bootstrap.less 5 additions, 4 deletionsthemes/bootstrap3/less/bootstrap.less
Please register or sign in to comment