eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
b7d0746694
gnu-social/theme/base/css
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
..
display.css Merge branch '0.9.x' into 1.0.x 2011-02-28 15:39:43 -08:00
ie6.css add CC BY 3.0 license to CSS files 2010-09-02 23:16:29 -04:00
ie.css add CC BY 3.0 license to CSS files 2010-09-02 23:16:29 -04:00
jquery.Jcrop.css add CC BY 3.0 license to CSS files 2010-09-02 23:16:29 -04:00
uap.css add CC BY 3.0 license to CSS files 2010-09-02 23:16:29 -04:00