Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up .gitignore. #28050

Merged
merged 1 commit into from
Jan 14, 2019
Merged

Clean up .gitignore. #28050

merged 1 commit into from
Jan 14, 2019

Conversation

XhmikosR
Copy link
Member

No description provided.

@XhmikosR XhmikosR merged commit e2a6f29 into v4-dev Jan 14, 2019
@XhmikosR XhmikosR deleted the v4-dev-xmr-gitignore branch January 14, 2019 19:08
bkdotcom added a commit to bkdotcom/bootstrap that referenced this pull request Jan 16, 2019
* v4-dev: (34 commits)
  tests: use jQuery from node_modules. (twbs#28059)
  Fix `js-main` script. (twbs#28057)
  Make progress animation respect `$enable-transitions` and `prefers-reduced-motion` media query
  Examples: add tabindex="-1" and aria-disabled="true" on disabled links
  Clean up .gitignore. (twbs#28050)
  Fix Carousel's touch option to not add touch listeners when set to false (twbs#28046)
  Remove map-merge (twbs#28033)
  Cleanup popover arrows (twbs#28008)
  Sync dropdown font size to base font size
  Sync dropdown font size with btn font size
  Remove background from nested tables
  Add some margin below the buttons
  Fix background size y
  Minify background property
  Combine background properties into one
  Prevent useless property rendering
  Don't render a background by default
  Prevent rendering of color property by default
  Change comment heading title to `Typography` (twbs#28032)
  Align toast variables (twbs#28041)
  ...

# Conflicts:
#	package.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants