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

Merge 0.26.x into master #1623

Merged
merged 17 commits into from
Jan 15, 2019
Merged

Merge 0.26.x into master #1623

merged 17 commits into from
Jan 15, 2019

Conversation

evgenykochetkov
Copy link
Contributor

knopki and others added 17 commits December 28, 2018 16:47
…ble-message

Make persistent update available message
Enlarge timeout for selector that mostly fails function tests
…terminals

Do not save terminal patches for custom types
…ed-files

Fix updating of project path while opening IDE via associated files
…ce of niix marker instead of attachment

This will prevent issues caused by "stranded" `patch.cpp` files.
…ening

When flattening, check that patch is leaf by presence of niix marker instead of attachment
…-0.26.1

Update changelog for upcoming 0.26.1
Copy link
Member

@nkrkv nkrkv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

@evgenykochetkov evgenykochetkov merged commit 33a761f into master Jan 15, 2019
@evgenykochetkov evgenykochetkov deleted the chore-merge-0.26.x branch January 15, 2019 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants