Merge branch 'develop' of https://github.com/nlohmann/json into develop
This commit is contained in:
commit
97fe455ad5
2
test/thirdparty/doctest/LICENSE.txt
vendored
2
test/thirdparty/doctest/LICENSE.txt
vendored
@ -1,6 +1,6 @@
|
|||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2016-2019 Viktor Kirilov
|
Copyright (c) 2016-2020 Viktor Kirilov
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
878
test/thirdparty/doctest/doctest.h
vendored
878
test/thirdparty/doctest/doctest.h
vendored
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user