Merge remote-tracking branch 'friendika/master' into newui

Browse source

...

This commit is contained in:

fabrixxm 2011-08-17 17:35:37 +02:00

parent 6c423feed2 db03b1ab17

commit bdf42473a0

101 changed files with 9954 additions and 6168 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

images/diaspora.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 461 B

BIN

images/friendika-16.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 770 B After Width:  |  Height:  |  Size: 756 B