Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev

Browse Source

Conflicts:
	locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
	locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po

...

This commit is contained in:

Nicolas Lœuillet

2014-07-21 21:21:55 +02:00

parent 26452f891f cec19bd866

commit 17065e613f

2 changed files with 337 additions and 328 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo Executable file → Normal file

Binary file not shown.