Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 master into develop #2107
merge master into develop #2107
Changes from all commits
aa0e51e
183ddd0
a382d2b
9dee0c0
32d0670
f3071a3
4f70930
2ec1338
0110f6f
a0df9fb
b23445c
3d5697e
eacb5a2
fc8657a
5163a67
a0f3dca
be5a889
329a198
a38a35f
10fd266
99c8456
159d0ca
3e9a1b6
ad4e1ca
b3e08e7
ecfb6c9
4f5a1d2
94f5da7
2506eab
ff13799
1a57f3a
689ff18
58cd8b2
bdbb41f
fce15d6
46e1ae2
3c07fd5
f3615c8
0360c80
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.