3 Commits

Author	SHA1	Message	Date
Brion Vibber	2f4438fe24	Merge branch '0.9.x' into 1.0.x ... Conflicts: actions/imsettings.php lib/jabber.php Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet. Should also move over the test cases.	2010-04-02 15:56:25 -07:00
Craig Andrews	c187bf5597	Merge branch '0.9.x' into 1.0.x ... Conflicts: EVENTS.txt db/statusnet.sql lib/queuemanager.php	2010-02-24 20:52:45 -05:00
Craig Andrews	e9995b0f6a	Create IM plugin, Pluginize XMPP, Create AIM plugin	2010-01-27 13:48:35 -05:00