diff options
author | Nicolas Lœuillet <nicolas.loeuillet@smile.fr> | 2014-10-10 13:33:54 +0200 |
---|---|---|
committer | Nicolas Lœuillet <nicolas.loeuillet@smile.fr> | 2014-10-10 13:33:54 +0200 |
commit | 44d35257e805856b4913c63fcbed3c0acb64bae8 (patch) | |
tree | 11e9d276c34b1b287706cb61182bdc71729661e2 /README.md | |
parent | af8292c1de1886cd975d79f0f42df40e0bd1c5bd (diff) | |
parent | cf8a5e1eedbed484dbcb1ddc9f7a13fc19b7a27b (diff) | |
download | wallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.tar.gz wallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.tar.zst wallabag-44d35257e805856b4913c63fcbed3c0acb64bae8.zip |
Merge branch 'dev'1.8.0
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. | ||