summaryrefslogtreecommitdiff
path: root/app/src/main/assets
diff options
context:
space:
mode:
authorH. Lehmann <ByteHamster@users.noreply.github.com>2020-05-04 10:11:12 +0200
committerGitHub <noreply@github.com>2020-05-04 10:11:12 +0200
commit4a81dc29f0121cd0e3dd3b76847b809902911edc (patch)
tree42ef6e289890fd189aa73aef273c121324c58015 /app/src/main/assets
parentd6d8ec43e1d061dbe04d98f3d53625dda75762e1 (diff)
parentf5d289d776bcd21d54adf3e7d6e10479be61ddff (diff)
downloadAntennaPod-4a81dc29f0121cd0e3dd3b76847b809902911edc.zip
Merge branch 'develop' into develop
Diffstat (limited to 'app/src/main/assets')
-rw-r--r--app/src/main/assets/licenses.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/src/main/assets/licenses.xml b/app/src/main/assets/licenses.xml
index c69f692cf..4f0255182 100644
--- a/app/src/main/assets/licenses.xml
+++ b/app/src/main/assets/licenses.xml
@@ -13,6 +13,12 @@
license="Apache 2.0"
licenseText="LICENSE_APACHE-2.0.txt" />
<library
+ name="Android Jetpack"
+ author="Google"
+ website="https://developer.android.com/jetpack"
+ license="Apache 2.0"
+ licenseText="LICENSE_APACHE-2.0.txt" />
+ <library
name="Apache Commons"
author="The Apache Software Foundation"
website="http://commons.apache.org/"
@@ -67,6 +73,12 @@
license="SIL Open Font, Version 1.1"
licenseText="LICENSE_SIL.txt" />
<library
+ name="Material Components"
+ author="Google"
+ website="https://github.com/material-components/material-components-android"
+ license="Apache 2.0"
+ licenseText="LICENSE_APACHE-2.0.txt" />
+ <library
name="OkHttp"
author="Square"
website="https://github.com/square/okhttp"