Merge branch 'mueller/master' into develop

This commit is contained in:
Robin Müller 2021-04-25 11:11:12 +02:00
commit 684ae7a9c4
3 changed files with 3 additions and 3 deletions

View File

@ -16,7 +16,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,

View File

@ -16,7 +16,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,

@ -1 +1 @@
Subproject commit 563603d0a1b03115e473768ccd203a21ebaac50c
Subproject commit fcf182c5e555b8abe05a5737142e82e8b1f805f6