Commit graph

4 commits

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
Thomas
6ae5962b00 More improved transparency for smilies 2012-03-09 01:49:12 +00: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
Friendika
1dea6a2d71 wrong return url for ajax comments on display and photos pages 2011-02-14 20:21:28 -08:00