1
1
Fork 0
Commit graph

5 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
erik 9b7df09e7a Edited view/sv/follow_notify_eml.tpl via GitHub 2011-03-22 10:46:49 -07:00
erik 771acb9cf7 Edited view/sv/follow_notify_eml.tpl via GitHub 2011-03-22 10:36:15 -07:00
erik e94ae8d396 commit001 2011-03-11 20:12:32 +01:00