Commit graph

7 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
friendica df0f7ef560 make network_to_name extensible 2012-01-08 02:08:20 -08:00
friendica 358b2a46f5 fix photo top view in testbubble, extend network_to_name 2012-01-07 13:00:06 -08:00
Friendika 20ca93191f cleanup and loose ends 2011-11-08 16:54:32 -08:00
Friendika 99ea045723 some minor work on contact edit page 2011-08-25 18:12:42 -07:00
Friendika 5d47417711 more view cleanup 2010-11-15 21:06:44 -08:00
Renamed from view/contact_selectors.php (Browse further)