gnu-social

History

Zach Copley b7d0746694 Merge branch '0.9.x' into 1.0.x

Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css

2011-02-28 15:39:43 -08:00

css

Merge branch '0.9.x' into 1.0.x

2011-02-28 15:39:43 -08:00

images

Using an icon to represent the action for more text

2010-03-18 14:29:35 +01:00

default-avatar-mini.png

Simpler separation of themes. New themes can either make use of the

2009-04-14 23:13:02 +00:00

default-avatar-profile.png

Simpler separation of themes. New themes can either make use of the