friendship ended with social-app. php is my new best friend

remove client-metadata from source control, fix merge conflict

root 1ea5f55b 21d9b4a9

Changed files
+2 -17
public
vendor
composer
-15
public/client-metadata.json
···
-
{
-
"client_id": "http://localhost:5173/client-metadata.json",
-
"application_type": "web",
-
"client_name": "smallbird-social",
-
"client_uri": "https://localhost:5173",
-
"dpop_bound_access_tokens": true,
-
"grant_types": ["authorization_code", "refresh_token"],
-
"redirect_uris": ["http://localhost:5173/login"],
-
"response_types": ["code"],
-
"scope": "atproto transition:generic",
-
"dpop_bound_access_tokens": true,
-
"jwks_uri": "http://localhost:5173/jwks.json",
-
"token_endpoint_auth_method": "private_key_jwt",
-
"token_endpoint_auth_signing_alg": "ES256"
-
}
+2 -2
vendor/composer/installed.php
···
'name' => '__root__',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
-
'reference' => '257124f543ff1eb7215a3a52a494881277141421',
+
'reference' => '9928676233cfb9f6f6af89926171714328098c47',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
···
'__root__' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
-
'reference' => '257124f543ff1eb7215a3a52a494881277141421',
+
'reference' => '9928676233cfb9f6f6af89926171714328098c47',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),