diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
| commit | 714d920faea302b55857cc3bec4e9e6160ea136a (patch) | |
| tree | cffa5ee7a3261ad24b272cb3ced16a6c1dcafad1 /actions/shownotice.php | |
| parent | c187bf55974347f7ddb4f28714af57861dce8f08 (diff) | |
| parent | 51a245f18c1e4a830c5eb94f3e60c6b4b3e560ee (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
Diffstat (limited to 'actions/shownotice.php')
0 files changed, 0 insertions, 0 deletions