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 22624917e0 improved smiley transparency 2012-03-06 23:54:31 +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 ce8c6dfaf7 just in time for valentines day - heart smiley <3 2011-02-13 17:24:42 -08:00