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

master

Andrew Dolgov 11 years ago

parent c855628d2d 84eee5df1b

commit 6d473e9cd5

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

View File

Binary file not shown.

2070

locale/fr_FR/LC_MESSAGES/messages.po

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save