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
..
2010-04-22 13:11:49 -07:00
2011-02-25 12:15:38 -08:00
2010-10-29 15:28:48 -07:00
2010-11-15 13:26:42 -08:00
2010-09-06 10:07:43 -04:00
2010-03-28 14:38:07 -04:00
2010-09-21 14:06:39 -04:00
2010-02-26 12:19:33 -05:00
2010-02-08 15:32:20 -08:00
2010-11-22 11:10:10 -08:00
2010-11-18 14:40:05 -08:00
2010-04-21 20:20:43 +02:00
2010-03-15 09:42:25 -07:00
2010-10-29 15:11:41 -07:00
2010-04-07 11:40:16 -07:00
2010-03-23 17:24:01 -07:00
2010-03-11 11:52:19 -08:00
2010-10-04 15:13:27 -07:00
2010-09-06 10:07:43 -04:00
2010-07-28 12:04:37 -04:00
2010-03-04 23:30:04 -05:00
2010-11-30 10:27:32 -05:00
2010-03-09 10:55:48 -05:00
2010-03-22 13:56:16 -07:00
2010-09-30 11:29:31 -07:00
2010-02-25 17:56:01 -08:00
2010-09-30 11:29:31 -07:00
2010-10-29 14:34:27 -07:00
2011-01-19 15:13:46 -08:00
2010-03-10 11:54:00 -08:00
2010-12-17 16:27:20 -05:00
2010-04-15 23:02:29 +02:00
2010-07-20 17:34:58 -07:00
2010-09-09 13:14:52 -04:00
2010-09-06 10:07:43 -04:00
2010-04-12 11:50:42 -07:00
2010-04-09 11:37:29 -07:00
2010-09-06 10:07:43 -04:00
2010-09-18 00:23:38 +02:00
2010-09-18 23:50:36 +02:00
2010-02-18 13:44:16 -05:00
2010-02-18 12:14:34 -05:00
2010-02-03 14:58:29 -05:00
2010-10-26 11:19:47 -04:00