GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
gnu-social/plugins/SubMirror/actions
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
..
addmirror.php * i18n/L10n updates 2010-09-18 22:31:41 +02:00
basemirror.php * i18n/L10n updates 2010-09-18 22:31:41 +02:00
editmirror.php * i18n/L10n updates 2010-09-18 22:31:41 +02:00
mirrorsettings.php Merge branch '0.9.x' into 1.0.x 2011-02-28 15:39:43 -08:00