Changeset 1701ba0 for public/assets/js/examples/pages

Timestamp:

10/27/21 09:12:02 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

develop, master

Children:

e2e83fc

Parents:

33439a5 (diff), c2e9bd9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve of merge conflict

Location:

public/assets/js/examples/pages

Files:

• analytics-dashboard.js (added)
• calendar.js (added)
• customers.js (added)
• ecommerce-dashboard.js (added)
• gallery.js (added)
• orders.js (added)
• product-detail.js (added)
• product-grid.js (added)
• product-list.js (added)
• project-grid.js (added)
• project-list.js (added)
• projects-dashboard.js (added)
• user-list.js (added)