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

Browse Source

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

master

Andrew Dolgov 11 years ago

parent ed61425af0 127585a05c

commit 2bf5783f81

2 changed files with 1174 additions and 1228 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

BIN

locale/de_DE/LC_MESSAGES/messages.mo

View File

Binary file not shown.

2402

locale/de_DE/LC_MESSAGES/messages.po

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save