]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
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)
Conflicts:
locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po

1  2 
locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo

index b363385ac3f3e30a95b3fa573cbc8258a817f186,297516c002b885a90f733cbe104910659d3fafa9..297516c002b885a90f733cbe104910659d3fafa9
mode 100755,100755..100644
Binary files differ