Merge branch 'master' of git://github.com/EyesX/Tiny-Tiny-RSS into EyesX-master

Browse Source

Conflicts:
	locale/sv_SE/LC_MESSAGES/messages.mo
	locale/sv_SE/LC_MESSAGES/messages.po

...

This commit is contained in:

Andrew Dolgov 2013-05-25 09:36:42 +04:00

parent f17c3ee29a 9bc0a6006e

commit 33945d7517

2 changed files with 961 additions and 982 deletions

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

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

BIN

locale/sv_SE/LC_MESSAGES/messages.mo

View File

Binary file not shown.

1943

locale/sv_SE/LC_MESSAGES/messages.po

View File

File diff suppressed because it is too large Load Diff