TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Mohit Panjwani
2020-01-05 13:45:10 +05:30
parent 8e2525cc6c 87dc78eea0
commit db4c7f5e32
12 changed files with 1108 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/js/app.js
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/assets/js/app.js": "/assets/js/app.js?id=b809b004d6c1fc6d88bf",
"/assets/js/app.js": "/assets/js/app.js?id=37e6828267df7fe0f92a",
"/assets/css/crater.css": "/assets/css/crater.css?id=ade5377bd8ec409249bf"
}