diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-30 09:59:06 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-30 09:59:06 +0200 |
commit | d181bd728565454ec53d960f321ed0a4c3bf26c8 (patch) | |
tree | 0339aca4a13dc41016bc12081c42b2405dc6f929 /docs/en/conf.py | |
parent | 7a90ca6171995e16b74f14712fafb42b636bdb3e (diff) | |
parent | 82a590fdddcb2458fc7f79d300cc12be3500b09c (diff) | |
download | wallabag-d181bd728565454ec53d960f321ed0a4c3bf26c8.tar.gz wallabag-d181bd728565454ec53d960f321ed0a4c3bf26c8.tar.zst wallabag-d181bd728565454ec53d960f321ed0a4c3bf26c8.zip |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'docs/en/conf.py')
0 files changed, 0 insertions, 0 deletions