mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix merge conflicts
This commit is contained in:
parent
bcfee41a57
commit
d33230d361
97 changed files with 1205 additions and 811 deletions
|
@ -235,7 +235,7 @@
|
|||
$('#regPrice', page).html("<h3>" + Globalize.translate('ValuePriceUSD').replace('{0}', "$" + pkg.price.toFixed(2)) + "</h3>");
|
||||
$('#ppButton', page).hide();
|
||||
|
||||
var url = "http://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
|
||||
var url = "https://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
|
||||
|
||||
fetch(url).then(function (response) {
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue