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

...

This commit is contained in:

Andrew Dolgov 2013-04-02 16:55:13 +04:00

parent ed61425af0 127585a05c

commit 2bf5783f81

2 changed files with 1118 additions and 1172 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/de_DE/LC_MESSAGES/messages.mo

View File

Binary file not shown.

2290

locale/de_DE/LC_MESSAGES/messages.po

View File

File diff suppressed because it is too large Load Diff