Skip to content

Commit 0346166

Browse files
Fixed conflicts
2 parents a5abe1d + a2a64b7 commit 0346166

File tree

110 files changed

+566
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+566
-96
lines changed

packages/Webkul/Admin/publishable/assets/css/admin.css

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/Webkul/Admin/publishable/assets/js/admin.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/Webkul/Admin/publishable/assets/js/admin.js.LICENSE.txt

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,18 @@
11
/*!
2-
* Sizzle CSS Selector Engine v2.3.6
3-
* https://sizzlejs.com/
4-
*
5-
* Copyright JS Foundation and other contributors
6-
* Released under the MIT license
7-
* https://js.foundation/
8-
*
9-
* Date: 2021-02-16
10-
*/
11-
12-
/*!
13-
* Vue.js v2.6.14
14-
* (c) 2014-2021 Evan You
2+
* Vue.js v2.7.16
3+
* (c) 2014-2023 Evan You
154
* Released under the MIT License.
165
*/
176

187
/*!
19-
* jQuery JavaScript Library v3.6.0
8+
* jQuery JavaScript Library v3.7.1
209
* https://jquery.com/
2110
*
22-
* Includes Sizzle.js
23-
* https://sizzlejs.com/
24-
*
2511
* Copyright OpenJS Foundation and other contributors
2612
* Released under the MIT license
2713
* https://jquery.org/license
2814
*
29-
* Date: 2021-03-02T17:08Z
15+
* Date: 2023-08-28T13:37Z
3016
*/
3117

3218
/**
@@ -35,6 +21,12 @@
3521
* @license MIT
3622
*/
3723

24+
/**
25+
* vue-cal v3.11.0
26+
* (c) 2022 Antoni Andre <[email protected]>
27+
* @license MIT
28+
*/
29+
3830
/**
3931
* @license
4032
* Lodash <https://lodash.com/>

packages/Webkul/Admin/publishable/assets/js/admin/127.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/**
2+
* vue-cal v3.11.0
3+
* (c) 2022 Antoni Andre <[email protected]>
4+
* @license MIT
5+
*/

packages/Webkul/Admin/publishable/assets/js/admin/131.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/**
2+
* vue-cal v3.11.0
3+
* (c) 2022 Antoni Andre <[email protected]>
4+
* @license MIT
5+
*/

packages/Webkul/Admin/publishable/assets/js/admin/155.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/**
2+
* vue-cal v3.11.0
3+
* (c) 2022 Antoni Andre <[email protected]>
4+
* @license MIT
5+
*/

packages/Webkul/Admin/publishable/assets/js/admin/170.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)