Merge pull request #178266 from Flakebi/powerdns-admin
powerdns-admin: 0.2.4 -> 0.3.0
This commit is contained in:
commit
a16b7de65f
3 changed files with 51 additions and 93 deletions
|
@ -1,27 +1,16 @@
|
|||
{ lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }:
|
||||
|
||||
let
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngoduykhanh";
|
||||
repo = "PowerDNS-Admin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xJ0NNnDVwGl+t9q1INPhCxcTmQayYBYdjEG0PbPCI9E=";
|
||||
hash = "sha256-e11u0jdJr+2TDXvBAPlDfnuuDwSfBq+JtvnDUTNKp/c=";
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.16.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
extension = "zip";
|
||||
sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
|
||||
};
|
||||
# Needs networking for some tests
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# The bravado-core dependency is incompatible with jschonschema 4.0:
|
||||
# https://github.com/Yelp/bravado-core/pull/385
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
|
||||
|
@ -43,8 +32,8 @@ let
|
|||
flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify
|
||||
mysqlclient psycopg2 sqlalchemy
|
||||
cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython
|
||||
gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core
|
||||
lima pytimeparse pyyaml
|
||||
gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core
|
||||
lima pytimeparse pyyaml jinja2 itsdangerous werkzeug
|
||||
];
|
||||
|
||||
assets = mkYarnPackage {
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
"dependencies": {
|
||||
"admin-lte": "2.4.9",
|
||||
"bootstrap": "^3.4.1",
|
||||
"bootstrap-datepicker": "^1.8.0",
|
||||
"bootstrap-validator": "^0.11.9",
|
||||
"datatables.net-plugins": "^1.10.19",
|
||||
"icheck": "^1.0.2",
|
||||
|
@ -12,5 +13,5 @@
|
|||
"multiselect": "^0.9.12"
|
||||
},
|
||||
"name": "powerdns-admin-assets",
|
||||
"version": "0.2.4"
|
||||
"version": "0.3.0"
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
path = fetchurl {
|
||||
name = "admin_lte___admin_lte_2.4.9.tgz";
|
||||
url = "https://registry.yarnpkg.com/admin-lte/-/admin-lte-2.4.9.tgz";
|
||||
sha1 = "effc04dbb587ccb7d674d4cf663cc141f925ed73";
|
||||
sha512 = "+u3zt5sWPPT8HmBvRg4F8IGZPaE5wD0K10+IjXoynfe/jEUrMMj+4eA1LGH9fMK6QulmFr1NCtc1Tk+mTgC24A==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -49,30 +49,6 @@
|
|||
sha1 = "a0e7c95ac7624d6417b4494b1e68bff693168a20";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "array_filter___array_filter_0.0.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "array_filter___array_filter_0.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz";
|
||||
sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "array_map___array_map_0.0.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "array_map___array_map_0.0.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz";
|
||||
sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "array_reduce___array_reduce_0.0.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "array_reduce___array_reduce_0.0.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz";
|
||||
sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "asn1.js___asn1.js_4.10.1.tgz";
|
||||
path = fetchurl {
|
||||
|
@ -118,7 +94,7 @@
|
|||
path = fetchurl {
|
||||
name = "bn.js___bn.js_4.12.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz";
|
||||
sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88";
|
||||
sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -126,7 +102,7 @@
|
|||
path = fetchurl {
|
||||
name = "bootstrap_colorpicker___bootstrap_colorpicker_2.5.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.3.tgz";
|
||||
sha1 = "b50aff8590fbaa6b5aa63a5624e4213f1659a49d";
|
||||
sha512 = "xdllX8LSMvKULs3b8JrgRXTvyvjkSMHHHVuHjjN5FNMqr6kRe5NPiMHFmeAFjlgDF73MspikudLuEwR28LbzLw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -134,7 +110,7 @@
|
|||
path = fetchurl {
|
||||
name = "bootstrap_datepicker___bootstrap_datepicker_1.8.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.8.0.tgz";
|
||||
sha1 = "c63513931e6f09f16ae9f11b62f32d950df3958e";
|
||||
sha512 = "213St/G8KT3mjs4qu4qwww74KWysMaIeqgq5OhrboZjIjemIpyuxlSo9FNNI5+KzpkkxkRRba+oewiRGV42B1A==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -174,7 +150,7 @@
|
|||
path = fetchurl {
|
||||
name = "bootstrap___bootstrap_3.4.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz";
|
||||
sha1 = "c3a347d419e289ad11f4033e3c4132b87c081d72";
|
||||
sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -190,7 +166,7 @@
|
|||
path = fetchurl {
|
||||
name = "brorand___brorand_1.1.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz";
|
||||
sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
|
||||
sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8=";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -298,11 +274,11 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
|
||||
name = "cached_path_relative___cached_path_relative_1.1.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz";
|
||||
sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db";
|
||||
name = "cached_path_relative___cached_path_relative_1.1.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz";
|
||||
sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -334,7 +310,7 @@
|
|||
path = fetchurl {
|
||||
name = "ckeditor___ckeditor_4.11.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.11.3.tgz";
|
||||
sha1 = "91f66d7ddb5bff3874514fe539779686874ed655";
|
||||
sha512 = "v6G+v16WAcukKuQH6m+trA9RCOQntFM2nxPO/GFiLYsdD/5IbZAZ2n7GwMxQmxDXpx4AixpnMWF+yAE1t9wq6Q==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -438,7 +414,7 @@
|
|||
path = fetchurl {
|
||||
name = "datatables.net_bs___datatables.net_bs_1.10.19.tgz";
|
||||
url = "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.10.19.tgz";
|
||||
sha1 = "08763b4e4d0cef1a427d019dc15e717c7ed67a4d";
|
||||
sha512 = "5gxoI2n+duZP06+4xVC2TtH6zcY369/TRKTZ1DdSgDcDUl4OYQsrXCuaLJmbVzna/5Y5lrMmK7CxgvYgIynICA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -446,7 +422,7 @@
|
|||
path = fetchurl {
|
||||
name = "datatables.net_plugins___datatables.net_plugins_1.10.20.tgz";
|
||||
url = "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.10.20.tgz";
|
||||
sha1 = "c89f6bed3fa7e6605cbeaa35d60f223659e84c8c";
|
||||
sha512 = "rnhNmRHe9UEzvM7gtjBay1QodkWUmxLUhHNbmJMYhhUggjtm+BRSlE0PRilkeUkwckpNWzq+0fPd7/i0fpQgzA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -454,7 +430,7 @@
|
|||
path = fetchurl {
|
||||
name = "datatables.net___datatables.net_1.10.19.tgz";
|
||||
url = "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.19.tgz";
|
||||
sha1 = "97a1ed41c85e62d61040603481b59790a172dd1f";
|
||||
sha512 = "+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -534,7 +510,7 @@
|
|||
path = fetchurl {
|
||||
name = "elliptic___elliptic_6.5.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz";
|
||||
sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb";
|
||||
sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -574,7 +550,7 @@
|
|||
path = fetchurl {
|
||||
name = "flot___flot_0.8.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/flot/-/flot-0.8.3.tgz";
|
||||
sha1 = "6d9b93c7aa2cfb30dfa1af9c1ec4c94070b1217f";
|
||||
sha512 = "xg2otcTJDvS+ERK+my4wxG/ASq90QURXtoM4LhacCq0jQW2jbyjdttbRNqU2cPykrpMvJ6b2uSp6SAgYAzj9tQ==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -598,7 +574,7 @@
|
|||
path = fetchurl {
|
||||
name = "fullcalendar___fullcalendar_3.10.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-3.10.0.tgz";
|
||||
sha1 = "cc5e87d518fd6550e142816a31dd191664847919";
|
||||
sha512 = "0OtsHhmdYhtFmQwXzyo8VqHzYgamg+zVOoytv5N13gI+iF6CGjevpCi/yBaQs0O4wY3OAp8I688IxdNYe0iAvw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -638,7 +614,7 @@
|
|||
path = fetchurl {
|
||||
name = "hash.js___hash.js_1.1.7.tgz";
|
||||
url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz";
|
||||
sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42";
|
||||
sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -646,7 +622,7 @@
|
|||
path = fetchurl {
|
||||
name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz";
|
||||
sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
|
||||
sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE=";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -694,7 +670,7 @@
|
|||
path = fetchurl {
|
||||
name = "inherits___inherits_2.0.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
|
||||
sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
|
||||
sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -742,7 +718,7 @@
|
|||
path = fetchurl {
|
||||
name = "ion_rangeslider___ion_rangeslider_2.3.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.0.tgz";
|
||||
sha1 = "7957ce2e78acfc956b8c43009373da91f743347e";
|
||||
sha512 = "7TtH9/X4Aq/xCzboWxjwlv20gVqR90Ysc3aehMlTuH2/ULaSxpB80hq+yvD1N0FwWbPDtxQpjQrz/iX+LWXKmg==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -818,11 +794,11 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "jquery_ui___jquery_ui_1.12.1.tgz";
|
||||
name = "jquery_ui___jquery_ui_1.13.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "jquery_ui___jquery_ui_1.12.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz";
|
||||
sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
|
||||
name = "jquery_ui___jquery_ui_1.13.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz";
|
||||
sha512 = "Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -830,15 +806,15 @@
|
|||
path = fetchurl {
|
||||
name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz";
|
||||
sha1 = "240c9f435e936c63bf8fbba355144ffdddf9ea26";
|
||||
sha512 = "20FJSCW3kTawO6Jvy/6MtUCURvgUZFqRUOAGTxH/VaPlwLG4kba82sKaM3ghTi1DsmSZrM2BvrwLUwNWmwDXiw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "jquery___jquery_3.3.1.tgz";
|
||||
name = "jquery___jquery_3.6.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "jquery___jquery_3.3.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz";
|
||||
sha1 = "958ce29e81c9790f31be7792df5d4d95fc57fbca";
|
||||
name = "jquery___jquery_3.6.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz";
|
||||
sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -870,7 +846,7 @@
|
|||
path = fetchurl {
|
||||
name = "jtimeout___jtimeout_3.1.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/jtimeout/-/jtimeout-3.1.0.tgz";
|
||||
sha1 = "4cd65b28eff8b9f8c61d08889a9ac3abdf5d9893";
|
||||
sha512 = "xA2TlImMGj4c0yAiM9BUq+8aAFVYVYUX2tkcC8u8das9qoZSs13SxhVcfWqI4cHOsv3huj2D0VRNHeVCLO3mVQ==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -926,7 +902,7 @@
|
|||
path = fetchurl {
|
||||
name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
|
||||
sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7";
|
||||
sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -934,7 +910,7 @@
|
|||
path = fetchurl {
|
||||
name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz";
|
||||
sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a";
|
||||
sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo=";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -978,19 +954,11 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "moment___moment_2.24.0.tgz";
|
||||
name = "moment___moment_2.29.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "moment___moment_2.24.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz";
|
||||
sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "moment___moment_2.22.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "moment___moment_2.22.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz";
|
||||
sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
|
||||
name = "moment___moment_2.29.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz";
|
||||
sha512 = "UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -1074,11 +1042,11 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "path_parse___path_parse_1.0.5.tgz";
|
||||
name = "path_parse___path_parse_1.0.7.tgz";
|
||||
path = fetchurl {
|
||||
name = "path_parse___path_parse_1.0.5.tgz";
|
||||
url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz";
|
||||
sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
|
||||
name = "path_parse___path_parse_1.0.7.tgz";
|
||||
url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz";
|
||||
sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -1250,11 +1218,11 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "shell_quote___shell_quote_1.6.1.tgz";
|
||||
name = "shell_quote___shell_quote_1.7.3.tgz";
|
||||
path = fetchurl {
|
||||
name = "shell_quote___shell_quote_1.6.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz";
|
||||
sha1 = "f4781949cce402697127430ea3b3c5476f481767";
|
||||
name = "shell_quote___shell_quote_1.7.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz";
|
||||
sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue