3c4ead4996
Conflicts: db/08to09.sql locale/statusnet.po scripts/update_po_templates.php |
||
---|---|---|
.. | ||
js | ||
locale | ||
allmap.php | ||
map.php | ||
MapstractionPlugin.php | ||
usermap.js | ||
usermap.php |
3c4ead4996
Conflicts: db/08to09.sql locale/statusnet.po scripts/update_po_templates.php |
||
---|---|---|
.. | ||
js | ||
locale | ||
allmap.php | ||
map.php | ||
MapstractionPlugin.php | ||
usermap.js | ||
usermap.php |