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
Merging master back to dev #173
Merging master back to dev #173
Changes from all commits
8d181e9
b6f08cc
0c44711
318286f
73e52e1
917d66e
f547dc9
3fbcb35
c140b23
20d8152
30b1f23
f641489
e49c3e6
fa4c294
81a145f
da77df1
24c2130
6ab0139
897df28
f68fba1
1db2339
bef628d
2fad859
4fc2870
a0b26de
ae0ba57
28e9478
7fddaf2
3e1117d
2e5ed34
c66b640
29cc8ee
c6b433c
5f9f5c4
ae7f5eb
b855066
4915fdf
d2d6118
4189bb7
da61134
94fcc53
9cf9c62
baa7878
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.