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 develop into master #268
Merge develop into master #268
Changes from all commits
c9bd7eb
97cf768
305ff2a
a37c200
52e0689
1e18abb
f536c4b
79dfc0d
5f1b709
ed5aa70
ac4949b
8f886a4
98be477
6f39753
4d195ca
8c1b316
f290300
98f31b1
96fe2ef
47f31e9
0ca5e10
baf09df
270052f
6d007d0
9fc54a6
0eae350
30e227d
cbaed7c
0351fbe
12d0723
c972238
6b19e4a
9ddc613
9e1e9cd
2d2bf0a
f597f46
0178db3
05b29f7
df512fc
371a0b8
243023d
1874bf2
20722a4
4c61431
2b98d5f
0866670
09cb67a
c2a3d3c
cc2b72f
7815af3
c318857
b258fbd
e818ad7
b0d5fa0
26914d5
12c0035
eaca87d
7e3a269
e7a78fb
7e2908c
6ecc089
4e7b030
6e3b8ff
bfe0af4
b073c9a
b983dfa
e3ee06c
2e14303
d310e4e
ac481eb
bb60cde
1b0ac85
f58ec31
61f525d
1c11745
f1c37d7
f5f5923
c6a80ae
cc9e6fd
8d29f5b
0a84516
61c4ce2
0eda743
9d5e748
4448fc6
61770ea
431aae3
2c61ac0
a91ced4
22a1e6f
45277ba
569d640
fb86e8e
7642c5d
9b5f877
5e51b80
b07dc06
b5ffad8
5dfab58
1bc2738
4d86f74
b01037a
4c080bf
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
This file was deleted.