]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
authorAlexandr Kondrashov <thekondrashov@gmail.com>
Fri, 11 Sep 2015 13:43:00 +0000 (16:43 +0300)
committerAlexandr Kondrashov <thekondrashov@gmail.com>
Fri, 11 Sep 2015 13:43:00 +0000 (16:43 +0300)
commitc9725926b2f30bed4e37f57c20ef8ffeb2fd233b
tree2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f
parent353e0a49a97c24d89f6cdb95014419d4137dee6e
parentb811f8cf9628dbcbfe994f71588c5a0c921a092d
Merge remote-tracking branch 'twbs/v4-dev' into patch-1

Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
scss/_custom-forms.scss
scss/_variables.scss