b7d0746694
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 |
||
---|---|---|
.. | ||
08to09_pg.sql | ||
08to09.sql | ||
074to080_pg.sql | ||
074to080.sql | ||
096to097.sql | ||
beta5tobeta6.sql | ||
core.php | ||
foreign_services.sql | ||
innodb.sql | ||
location_namespace.sql | ||
notice_source.sql | ||
rc2torc3.sql | ||
rc3torc4.sql | ||
site_093to094.sql | ||
site.sql | ||
sms_carrier.sql | ||
statusnet_pg.sql | ||
statusnet.sql |