-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into assemble/documents-refactor
- Loading branch information
Showing
52 changed files
with
1,228 additions
and
829 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
Copyright 2014-2021 Jolocom GmbH | ||
We have integrated the AA2-SDK of Governikus GmbH in Release 2.4. Thee AA2-SDK is governed by the European Union Public Licence (2021), EUPL. In accordance with Directive 2009/24/EC, our integration serves the sole purpose of increased interoperability and is thereby authorised 'as a copyright exception to the author's exclusive rights'. | ||
|
||
Copyright 2014-2022 Jolocom GmbH |
Oops, something went wrong.