diff options
| author | sgiehl <stefan@piwik.org> | 2014-11-04 21:25:17 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-11-04 21:25:17 +0300 |
| commit | 15853aafa054bd2ea6cc41b1d9275f06a0dc14c9 (patch) | |
| tree | 03ba4469e554f3e6e7c9d25feae0561c8d47263c /LEGALNOTICE | |
| parent | 0c97fc87a77f94426d0dc72d871fb5c3eca666d1 (diff) | |
| parent | 5be8b023adc77c2290ba2be4364c20f3f2204c3b (diff) | |
Merge branch 'master' into deprecate_usersettings
Conflicts:
LEGALNOTICE
Diffstat (limited to 'LEGALNOTICE')
| -rw-r--r-- | LEGALNOTICE | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/LEGALNOTICE b/LEGALNOTICE index 006d1658af..041aea3089 100644 --- a/LEGALNOTICE +++ b/LEGALNOTICE @@ -69,6 +69,14 @@ SEPARATELY LICENSED COMPONENTS AND LIBRARIES Link: https://github.com/piwik/device-detector License: LGPL + Name: Piwik/Decompress + Link: https://github.com/piwik/component-decompress + License: LGPL v3.0 + + Name: Piwik/Network + Link: https://github.com/piwik/component-network + License: LGPL v3.0 + THIRD-PARTY COMPONENTS AND LIBRARIES @@ -224,6 +232,10 @@ THIRD-PARTY COMPONENTS AND LIBRARIES Link: https://github.com/ccampbell/mousetrap License: Apache 2.0 + Name: PHP-DI + Link: http://php-di.org/ + License: MIT (Expat) + THIRD-PARTY CONTENT |