Conflicts: README actions/hostmeta.php classes/File_redirection.php lib/common.php lib/designsettings.php lib/router.php lib/util.php lib/xmppmanager.php plugins/OStatus/OStatusPlugin.php |
||
---|---|---|
.. | ||
js | ||
locale | ||
allmap.php | ||
map.php | ||
MapstractionPlugin.php | ||
usermap.js | ||
usermap.php |