diff options
| author | tcit <tcit@tcit.fr> | 2014-10-08 19:26:26 +0200 |
|---|---|---|
| committer | tcit <tcit@tcit.fr> | 2014-10-08 19:26:26 +0200 |
| commit | 8327f1c371ad1d930bf9c9a13e443f2aa29ecfe3 (patch) | |
| tree | ea559def90e546716f3d6016fe8f06f333249ef6 /README.md | |
| parent | d05f5eeb1dfd989e76f6040b220fe52738284841 (diff) | |
| parent | 73c833780c37278a319fd3bfff172eede1a040bd (diff) | |
| download | wallabag-8327f1c371ad1d930bf9c9a13e443f2aa29ecfe3.tar.gz wallabag-8327f1c371ad1d930bf9c9a13e443f2aa29ecfe3.tar.zst wallabag-8327f1c371ad1d930bf9c9a13e443f2aa29ecfe3.zip | |
Merge branch 'dev' into data-for-mysql
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. | ||