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 23460302f5 some admin page fixes and cleanup 2012-03-05 18:51:21 -08: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 ab27f1393e Admin site page 2011-06-13 18:03:06 +02:00
Fabio Comuni 3364c2a2d8 Initial admin page 2011-06-13 12:52:29 +02:00