Merge https://github.com/annando/friendica-addons into apull

Browse source

Conflicts:
	facebook/facebook.php

...

This commit is contained in:

friendica 2012-04-03 16:30:28 -07:00

parent e02ce5b200 9ff72061f2

commit 19b264a20c

5 changed files with 97 additions and 23 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

facebook.tgz

View file

Binary file not shown.