Alexander Kampmann
|
355c42cb30
|
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
|
2012-04-05 13:39:15 +02:00 |
|
friendica
|
8aa2552372
|
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
|
2012-01-18 16:21:30 -08:00 |
|
Fabio Comuni
|
afce790e56
|
oembed: wrap in iframe only html from remote service
|
2011-10-25 14:59:31 +02:00 |
|
Fabio Comuni
|
75d4f33233
|
move html for oembeded videos in template. fix oembed discovery
|
2011-10-24 17:28:28 +02:00 |
|