diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-21 21:21:55 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-21 21:21:55 +0200 |
| commit | 17065e613fde7c4226df66e4a1c57784190f29e1 (patch) | |
| tree | 6b64e30e6c70932e63b3cf0adfd21bfef2d7fbb7 /db | |
| parent | 26452f891f3ba75f2636733dbfe943535636df06 (diff) | |
| parent | cec19bd866f32028b8a286f8504f601df9842834 (diff) | |
| download | wallabag-17065e613fde7c4226df66e4a1c57784190f29e1.tar.gz wallabag-17065e613fde7c4226df66e4a1c57784190f29e1.tar.zst wallabag-17065e613fde7c4226df66e4a1c57784190f29e1.zip | |
Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev
Conflicts:
locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
Diffstat (limited to 'db')
0 files changed, 0 insertions, 0 deletions