diff options
author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2014-02-12 20:05:51 +0100 |
---|---|---|
committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2014-02-12 20:05:51 +0100 |
commit | 68268c01995d2136e4c04c4e8c650e7d0a4eaca2 (patch) | |
tree | 20dcbe7f9238c088dbf188ae997e81f38b2bb266 /README.md | |
parent | 5966d2c2d3f30ab7b4fdbaf3bf3176532118c0a1 (diff) | |
parent | 58f6269f36ae719edcc79139ef5e808de12d4a8e (diff) | |
download | wallabag-68268c01995d2136e4c04c4e8c650e7d0a4eaca2.tar.gz wallabag-68268c01995d2136e4c04c4e8c650e7d0a4eaca2.tar.zst wallabag-68268c01995d2136e4c04c4e8c650e7d0a4eaca2.zip |
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,4 +7,4 @@ More informations on our website: [wallabag.org](http://wallabag.org) | |||
7 | Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org> | 7 | Copyright © 2010-2013 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 Do What The Fuck You Want To Public License, Version 2, |
10 | as published by Sam Hocevar. See the COPYING file for more details. \ No newline at end of file | 10 | as published by Sam Hocevar. See the COPYING file for more details. |