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

Update master #1262

Merged
merged 24 commits into from
May 2, 2015
Merged

Update master #1262

merged 24 commits into from
May 2, 2015

Conversation

aashish24
Copy link
Contributor

Updating master with changes in release.

Sam Fries and others added 24 commits April 29, 2015 11:55
Fixes typo in CDMS raise statements
…on_disappear

Pressing the "i" key makes button disappear (and other issues)
removing test, too long, too much space needed
Merge colorpicker changes into release
aashish24 added a commit that referenced this pull request May 2, 2015
@aashish24 aashish24 merged commit df355f9 into master May 2, 2015
@aashish24 aashish24 deleted the update_master branch May 2, 2015 07:57
@chaosphere2112 chaosphere2112 mentioned this pull request May 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants