Commit graph

5 commits

Author SHA1 Message Date
Josh Soref
a0680e01ea spelling: embarrassed
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2023-03-26 16:03:23 -04:00
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
eb13833d2a smiley filter 2010-12-08 17:05:51 -08:00