diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-09 13:55:31 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-09 13:55:31 +0200 |
commit | 54c2d164a362e64a320438b439bf9dd6d2c02424 (patch) | |
tree | dc25a86685524e642cedfd95d02736ef06b28f77 /src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig | |
parent | b28c5430efefa63d04d87404c99798e82d0427e4 (diff) | |
parent | c829b06ed8f757f2b96515eb872f9ccf20363c94 (diff) | |
download | wallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.tar.gz wallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.tar.zst wallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.zip |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig index db193e81..f82e5dc5 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig | |||
@@ -106,8 +106,8 @@ | |||
106 | <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr> | 106 | <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr> |
107 | <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr> | 107 | <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr> |
108 | <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr> | 108 | <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr> |
109 | <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr> | 109 | <tr><td>j0k3r/graby</td><td>MIT</td></tr> |
110 | <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr> | 110 | <tr><td>j0k3r/graby-site-config</td><td>Public domain</td></tr> |
111 | <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr> | 111 | <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr> |
112 | <tr><td>j0k3r/safecurl</td><td>MIT</td></tr> | 112 | <tr><td>j0k3r/safecurl</td><td>MIT</td></tr> |
113 | <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr> | 113 | <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr> |