Conflicts: db/08to09.sql locale/statusnet.po scripts/update_po_templates.php |
||
---|---|---|
.. | ||
locale | ||
PoweredByStatusNetPlugin.php |
Conflicts: db/08to09.sql locale/statusnet.po scripts/update_po_templates.php |
||
---|---|---|
.. | ||
locale | ||
PoweredByStatusNetPlugin.php |