]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev
authorNicolas Lœuillet <nicolas@loeuillet.org>
Mon, 21 Jul 2014 19:21:55 +0000 (21:21 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Mon, 21 Jul 2014 19:21:55 +0000 (21:21 +0200)
commit17065e613fde7c4226df66e4a1c57784190f29e1
tree6b64e30e6c70932e63b3cf0adfd21bfef2d7fbb7
parent26452f891f3ba75f2636733dbfe943535636df06
parentcec19bd866f32028b8a286f8504f601df9842834
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
locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo