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	Big updates for themes rebase, clean, and shiny. A few more adjustments to come for 0.9.6, time (probably not) permitting.	2010-10-19 11:07:53 -04:00
default-avatar-mini.png	Provisional versions of two new themes (plus new base).	2010-09-23 10:50:45 -04:00
default-avatar-profile.png	Provisional versions of two new themes (plus new base).	2010-09-23 10:50:45 -04:00
default-avatar-stream.png	Provisional versions of two new themes (plus new base).	2010-09-23 10:50:45 -04:00
logo.png	Provisional versions of two new themes (plus new base).	2010-09-23 10:50:45 -04:00
mobilelogo.png	Provisional versions of two new themes (plus new base).	2010-09-23 10:50:45 -04:00
theme.ini	Provisional versions of two new themes (plus new base).	2010-09-23 10:50:45 -04:00