Merge branch 'master' of git://github.com/HeikoAdams/Tiny-Tiny-RSS into HeikoAdams-master
Conflicts: locale/de_DE/LC_MESSAGES/messages.mo locale/de_DE/LC_MESSAGES/messages.po
This commit is contained in:
commit
2bf5783f81
2 changed files with 1118 additions and 1172 deletions
Binary file not shown.
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue