Commit Graph

4 Commits (be1b398caf635058782d5aecbed3a0decc1aeba4)

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
Fabio Comuni 80af4f3fe6 new icons 2011-09-16 12:50:15 +02:00
Fabio Comuni c308ac49af More icons 2011-09-05 11:13:42 +02:00