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.

Sign up for GitHub

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

Jump to bottom

upstream merge #148

Closed
13 tasks done
djbuckley opened this issue Jul 18, 2017 · 0 comments
Closed
13 tasks done

upstream merge #148

djbuckley opened this issue Jul 18, 2017 · 0 comments
Assignees
@djbuckley
Labels
upstream merge

Comments

@djbuckley
Copy link

djbuckley commented Jul 18, 2017 •
edited
Loading

  • Take ownership of this issue
  • Move this to in progress
  • Commit, stash or discard local changes to the repository
  • Get latest code from this repository
  • Merge upstream changes from call-em-all (see the merge guide)
  • Resolve merge conflicts
  • Commit changes mentioning this issues number in the comments (see the commenting wiki page)
  • Push changes to GitHub
  • Create a new issue, duplicating this one
  • Set the label to upstream merge
  • Set the project to Material UI Phase two
  • Move this to complete
  • Add any comments and close this issue
@djbuckley djbuckley self-assigned this Jul 24, 2017
djbuckley added a commit that referenced this issue Jul 24, 2017
@djbuckley
Merge remote-tracking branch 'call_em_all_-_master/master' (issue #148)
86d26f2 
* call_em_all_-_master/master:
  fix: comment typo (mui#7523)
  [Docs] Add v0.18.7 to versions.json
  v0.18.7
  [CHANGELOG] Prepare v0.18.7
  [ListItem] Fix triggers onTouchTap when disabled (mui#7486)
  [Popover] Scroll Container issue (mui#7472)
  [Table] Don't set height to tbody (mui#7484)
  docs: fix typo in Avatar readme (mui#7478)

# Conflicts:
#	src/Popover/Popover.js
# merged both versions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@djbuckley djbuckley

Labels
upstream merge
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@djbuckley