pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.3

Browse Source
This commit is contained in:
Jeremy Benoist
2017-05-09 13:55:31 +02:00
parent b28c5430ef c829b06ed8
commit 54c2d164a3
13 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
View File

@ -106,8 +106,8 @@
<tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
<tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
<tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
<tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
<tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
<tr><td>j0k3r/graby</td><td>MIT</td></tr>
<tr><td>j0k3r/graby-site-config</td><td>Public domain</td></tr>
<tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
<tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
<tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>