Merge https://github.com/friendica/friendica into pull

Browse Source

...

This commit is contained in:

friendica 2013-04-28 21:03:21 -07:00

parent 1d358fe6de 0bbd0939e4

commit c08e791e43

2 changed files with 1818 additions and 5205 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

6041

view/zh-cn/messages.po

View File

File diff suppressed because it is too large Load Diff

982

view/zh-cn/strings.php

View File

File diff suppressed because it is too large Load Diff