Commit graph

3 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
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
Devlon Duthie 7285bb2db9 added templates to testbubble theme to clarify the delete buttons vsxt on the edit group/drop group
misc. changes to notifications.png for style-specific icons
2011-09-25 19:23:26 -05:00