Commit Graph

4 Commits (0b66f3ed1eb07091d105b4e71783852204b59960)

Author SHA1 Message Date
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 d80c0da3c0 add custom style to object tag in tinymce 2011-10-21 16:26:57 +02:00
Mike Macgirvin 6348e70daa Initial checkin 2010-07-01 16:48:07 -07:00