Mikael Nordfeldth
|
c8c7f5b3fe
|
Test against PHP_VERSION < 5.2.6, we don't support that low
|
2014-05-09 10:36:22 +02:00 |
Brion Vibber
|
e89908f261
|
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/channel.php
scripts/imdaemon.php
|
2010-03-22 13:56:16 -07:00 |
Craig Andrews
|
20d6a7caed
|
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/queuemanager.php
lib/xmppmanager.php
plugins/Xmpp/Fake_XMPP.php
scripts/imdaemon.php
|
2010-02-16 13:15:09 -05:00 |
|
Craig Andrews
|
914bc9f9c5
|
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/queuemanager.php
|
2010-01-27 22:07:04 -05:00 |
|
Craig Andrews
|
e9995b0f6a
|
Create IM plugin, Pluginize XMPP, Create AIM plugin
|
2010-01-27 13:48:35 -05:00 |