diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-01-26 13:32:07 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-01-26 13:32:07 +0100 |
| commit | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (patch) | |
| tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /COPYING.md | |
| parent | 463cb376e357d50c5913452fba68a70bf43492c9 (diff) | |
| parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
| download | wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.gz wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.zst wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'COPYING.md')
| -rw-r--r-- | COPYING.md | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (c) 2013-2016 Nicolas Lœuillet | 1 | Copyright (c) 2013-2017 Nicolas Lœuillet |
| 2 | 2 | ||
| 3 | Permission is hereby granted, free of charge, to any person obtaining a copy | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| 4 | of this software and associated documentation files (the "Software"), to deal | 4 | of this software and associated documentation files (the "Software"), to deal |