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

Browse Source

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

...

This commit is contained in:

Andrew Dolgov

2013-03-27 12:48:13 +04:00

parent c855628d2d 84eee5df1b

commit 6d473e9cd5

2 changed files with 821 additions and 1201 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/fr_FR/LC_MESSAGES/messages.mo

Binary file not shown.

2022

locale/fr_FR/LC_MESSAGES/messages.po

File diff suppressed because it is too large Load Diff