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 dev #1116
merge master into dev #1116
Changes from all commits
d3c2a12
17766b2
8851074
d6b797c
07d35d7
e3866b7
b2b07f9
19a45e2
328853f
4b606e8
e14d807
b580d63
f2159d3
a1c9b65
53e754d
f968d88
8cfaee7
ed28720
a092ba4
6701224
84b197a
c1bcf89
d256559
c1cf978
bd7eb41
94cef6a
528a18d
86782ea
c6f0deb
9af2d61
939a836
9b99db7
86335f0
fcfa834
ca1b17e
fe62e1a
3f949e3
3766492
0aac4aa
c28980e
6d772cb
7b4be38
8e78970
5b59561
7396c4e
7d4d70e
8df80b6
cc83e16
65d1592
7518e18
65b2f43
7f55b15
70b734c
1cd994c
fdc1529
dbf76fe
4a6ca5e
7c8829e
de805fa
1c872d6
f6654cc
202a659
aeb2e57
8ad6f73
8cbe326
566feb3
ff10615
04c1d70
f6b9079
0a6f1b1
df25391
e1a31b3
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing