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 |
||
---|---|---|
.. | ||
locale | ||
SimpleUrlPlugin.php |
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 |
||
---|---|---|
.. | ||
locale | ||
SimpleUrlPlugin.php |