aboutsummaryrefslogtreecommitdiffhomepage
path: root/README.md
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2017-01-26 13:32:07 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-01-26 13:32:07 +0100
commit78295b99dd1721c613f1ce52e2debbe6f6db7753 (patch)
treee76f3e8142399316ec5660fab8c646b2c34b8336 /README.md
parent463cb376e357d50c5913452fba68a70bf43492c9 (diff)
parent05fa529bcfde01be5d320cb532900d72cf4b0830 (diff)
downloadwallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.gz
wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.zst
wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.zip
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index c9488288..f96e2b8c 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,6 @@ make run
22``` 22```
23 23
24# License 24# License
25Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org> 25Copyright © 2013-2017 Nicolas Lœuillet <nicolas@loeuillet.org>
26This work is free. You can redistribute it and/or modify it under the 26This work is free. You can redistribute it and/or modify it under the
27terms of the MIT License. See the COPYING file for more details. 27terms of the MIT License. See the COPYING file for more details.