forked from GNUsocial/gnu-social
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 |
||
---|---|---|
.. | ||
doc-src | ||
extlib | ||
locale | ||
finishaddopenid.php | ||
finishopenidlogin.php | ||
openid.php | ||
openidadminpanel.php | ||
openidlogin.php | ||
OpenIDPlugin.php | ||
openidserver.php | ||
openidsettings.php | ||
openidtrust.php | ||
User_openid_trustroot.php | ||
User_openid.php |