diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-25 07:27:21 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-25 07:27:21 +0200 |
commit | fa9a7bbb3c61116e5db76c9f25ef2340fef971d7 (patch) | |
tree | cd733e8548290158d578da185bd541e7fe4b1a31 /README.md | |
parent | ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2 (diff) | |
parent | 830612f555d8bc72669fe9bc0686680001af0e52 (diff) | |
download | wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.tar.gz wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.tar.zst wallabag-fa9a7bbb3c61116e5db76c9f25ef2340fef971d7.zip |
Merge branch 'fix/securityAllowedActions' into dev
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -4,7 +4,6 @@ wallabag is a self hostable application allowing you to not miss any content any | |||
4 | More informations on our website: [wallabag.org](http://wallabag.org) | 4 | More informations on our website: [wallabag.org](http://wallabag.org) |
5 | 5 | ||
6 | ## License | 6 | ## License |
7 | Copyright © 2010-2014 Nicolas Lœuillet <nicolas@loeuillet.org> | 7 | Copyright © 2013-2014 Nicolas Lœuillet <nicolas@loeuillet.org> |
8 | This work is free. You can redistribute it and/or modify it under the | 8 | This work is free. You can redistribute it and/or modify it under the |
9 | terms of the Do What The Fuck You Want To Public License, Version 2, | 9 | terms of the MIT License. See the COPYING file for more details. |
10 | as published by Sam Hocevar. See the COPYING file for more details. | ||