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 #404
Merge master into develop #404
Changes from all commits
3fb8dc5
c0d8f97
2d63b8f
370edb5
9662403
9db82da
6f6a726
5e1e461
59bb62c
6d1afda
4248cc8
fb3f0ca
bdb3a3f
73db9b3
dde07d6
ed199a7
823a122
9ae36c1
fde2727
a52f0a3
5b6ad0c
a9dc0d7
47a5e69
921c11e
0045db6
6bf23a7
d3a744e
fcac495
05a84d2
f4a0744
aa8ff11
5e4874f
f79e8dc
d00da29
f4ada96
b564383
6ea1ef1
50b3e21
5e85ddc
c0fcfb1
b4686d5
f8fec26
9e82d13
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
These merge commits were added into this branch cleanly.
There are no new changes to show.