Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master

Browse Source

Conflicts:
	view/ru/strings.php

...

This commit is contained in:

friendica 2014-01-15 16:14:43 -08:00

parent f27d59a094 4fdd9c39c5

commit ec6b8e5cda

2 changed files with 5403 additions and 4858 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

8381

view/ru/messages.po

View File

File diff suppressed because it is too large Load Diff

1874

view/ru/strings.php

View File

File diff suppressed because it is too large Load Diff