Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Twitter Bootstrap updated to 2.2.1 #126

Closed
wants to merge 3 commits into from
+4,948 −4,804

3 participants

@kazuo

Merged 2.2.1 changes from Christoffer Niska's Yii Bootstrap.

kazuo added some commits
@kazuo kazuo Updated Twitter Bootstrap to 2.2.1
- Updated the primary CSS and JS files from the Twitter Bootstrap lib to
2.2.1.
- These were pulled from the original Yii Bootstrap project by
Christoffer Niska.
- Manually merged a number of fixes from Yii Bootstrap 1.2.0. Mainly
modified widgets. Checked the history of the original Yii Booster
project to make sure fixes made from the latter project weren't lost by
merging changes from the former.
2b517a6
@kazuo kazuo Removed a secondly declared property (previously bad merged) 060c33a
@kazuo kazuo Merged another change from Yii Bootstrap 1a66517
@yiqing-95

great news!

@tonydspaniard

@kazuo could you please update your repository and resubmit your PR? Thank you so much for your input

@tonydspaniard

@kazuo

Nevermind, I am doing it manually

@tonydspaniard tonydspaniard closed this pull request from a commit
Antonio Ramirez updated Bootstrap to 2.2.1 (thanks @kazuo) closes #126 01c26a9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 24, 2012
  1. @kazuo

    Updated Twitter Bootstrap to 2.2.1

    kazuo authored
    - Updated the primary CSS and JS files from the Twitter Bootstrap lib to
    2.2.1.
    - These were pulled from the original Yii Bootstrap project by
    Christoffer Niska.
    - Manually merged a number of fixes from Yii Bootstrap 1.2.0. Mainly
    modified widgets. Checked the history of the original Yii Booster
    project to make sure fixes made from the latter project weren't lost by
    merging changes from the former.
Commits on Nov 25, 2012
  1. @kazuo
  2. @kazuo
Something went wrong with that request. Please try again.