Skip to content

Commit

Permalink
change version number
Browse files Browse the repository at this point in the history
  • Loading branch information
hifocus committed Jun 16, 2023
1 parent ebdf14d commit f813d0c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion assets/bundles/function.main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/function.js
Expand Up @@ -248,7 +248,7 @@ document.getElementById("name").innerHTML = finaltitle;
document.getElementById("description").innerHTML = finalsub;

// Copyright console log copied from https://github.com/MoePlayer/APlayer/. Thank you.
console.log(`${'\n'} %c Merger 0.28.2 %c https://github.com/qr-merger/merger ${'\n'}`, 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;');
console.log(`${'\n'} %c Merger 0.28.4 %c https://github.com/qr-merger/merger ${'\n'}`, 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;');

function showqrcode() {
if (location.href.substr(location.href.lastIndexOf('#') + 1) == "showqrcode" && selected == "yes") document.getElementById('showqrcode').style.display = "flex";
Expand Down
6 changes: 3 additions & 3 deletions merger.html
@@ -1,5 +1,5 @@
<!--
Merger v0.28.2 - Merge Your Qrcodes Together. Even Quicker.
Merger v0.28.4 - Merge Your Qrcodes Together. Even Quicker.
User docs: https://docs.qrcdn.com/merger
Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
Author @hifocus (https://github.com/hifocus) and contributors(https://github.com/qr-merger/merger/graphs/contributors).
Expand All @@ -22,7 +22,7 @@

<!-- Load style files from local - Default -->
<!-- build:css -->
<link rel="stylesheet" href="https://cdn.staticfile.org/merger/0.28.2/bundles/style.main.css">
<link rel="stylesheet" href="https://cdn.staticfile.org/merger/0.28.4/bundles/style.main.css">
<!-- <link rel="stylesheet" href="/assets/bundles/style.main.css"> -->
<!-- endbuild -->
</head>
Expand Down Expand Up @@ -149,7 +149,7 @@ <h2 id="name"></h2>
<script src="https://cdn.staticfile.org/jquery/3.7.0/jquery.min.js"></script>
<script src="https://cdn.staticfile.org/lrsjng.jquery-qrcode/0.18.0/jquery-qrcode.min.js"></script>
<!-- build:js -->
<script src="https://cdn.staticfile.org/merger/0.28.2/bundles/function.main.js"></script>
<script src="https://cdn.staticfile.org/merger/0.28.4/bundles/function.main.js"></script>
<!-- <script src="/assets/bundles/function.main.js"></script> -->
<!-- endbuild -->

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "qr-merger",
"version": "0.28.2",
"version": "0.28.4",
"description": "📲 Merge Your Qrcodes Together. Even Quicker.",
"main": "merger.html",
"scripts": {
Expand Down

0 comments on commit f813d0c

Please sign in to comment.