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 from develop #26
merge from develop #26
Changes from 138 commits
0ca722e
423ee7b
410c203
04b559d
a62ba54
e0d7515
fbc786c
931acde
4b68f5b
3eb01d8
eadf62c
ad5a4b4
331d147
15a2e67
a6c40a3
58a474b
b682c9e
634e051
6bfc9d9
26224f2
15fc9a3
5aa0131
2e7fd0e
c268d53
caa43d8
12297b0
d043767
d37febe
52567c3
2f83f3d
d822835
2e1b01e
2663bc7
9adca64
d436d6a
2e1b956
52595d7
af7b497
38ffac5
1ae5740
54aa3cd
666631c
a9a8e5e
c8068d0
84fe41e
ccd0a50
4dda585
56bd743
884a217
82022fe
2d3da1f
71bbdb4
51e9ce6
9dc1816
de1e243
0a502e4
31d0ed5
f681109
c999436
fcbc2c2
562dd24
865e590
9e7a96a
21cc7a6
8a419f7
6393e17
c5e516a
5edfa94
89323d6
df4cacc
570eb2b
8f94945
ea18ddb
469078d
cbe4f7c
3997c3c
258dfb8
5b76224
94e08fb
9cd290e
eb82448
f00b97b
a9b755d
f6d8ec4
f369897
45ede5a
26fed98
7734694
9c0cd2c
a61e282
3bc78fc
68b942a
e2bfe67
70950f1
1888722
04afd84
5ad16b9
7f8f717
5e84cfe
27b418e
acda088
4ddb78f
baaec71
0f9f7ae
8319237
cad405e
ddcaa6d
e63bfed
6e1a9c7
a524f4d
8dcb342
e043039
ab51f66
deda76e
f6f9a53
7108d26
c942b88
77b5d6b
7b82d85
5310c5b
91acc3c
a110326
68e377d
904d2da
5c01150
7b32182
c3aa147
5b1e55a
c9ca423
9b85e01
0f55d2c
e5cb642
d1a0939
c1fd7e6
d649b6b
5d289de
246f096
6321d7d
679a05d
a429fa4
efd268e
2ec5bf1
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.