Brion Vibber
|
b1a68e15b7
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
|
2010-06-10 15:37:06 -07:00 |
Brenda Wallace
|
5afd07e5e8
|
added missing author
|
2010-06-08 16:46:32 +12:00 |
Craig Andrews
|
39392e03a7
|
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/imsettings.php
|
2010-04-18 19:21:15 -04:00 |
Siebrand Mazeland
|
3656a2cb13
|
Fix inconsistencies in clientError() messages
* use correct punctuation
* single quotes when replace was possible
* wording updated when needed
|
2010-04-10 00:58:57 +02:00 |
|
Craig Andrews
|
e9995b0f6a
|
Create IM plugin, Pluginize XMPP, Create AIM plugin
|
2010-01-27 13:48:35 -05:00 |
Zach Copley
|
ee3fc8ba03
|
Added some notes in the comments
|
2009-11-10 15:23:33 -08:00 |
|
Zach Copley
|
4e4ba24c00
|
Implement /api/account/update_delivery_device.format
|
2009-11-10 14:36:41 -08:00 |