Mistakenly overwritten files from merge of dev branch

This commit is contained in:
Michael Shamoon 2021-01-01 12:41:05 -08:00
parent a4e5d36a02
commit 6566e36141
2 changed files with 139 additions and 138 deletions

View File

@ -27,7 +27,11 @@
"assets": [ "assets": [
"src/favicon.ico", "src/favicon.ico",
"src/assets", "src/assets",
"src/manifest.webmanifest" "src/manifest.webmanifest", {
"glob": "pdf.worker.min.js",
"input": "node_modules/pdfjs-dist/build/",
"output": "/assets/js/"
}
], ],
"styles": [ "styles": [
"src/styles.scss" "src/styles.scss"
@ -131,8 +135,5 @@
} }
} }
}, },
"defaultProject": "paperless-ui", "defaultProject": "paperless-ui"
"cli": {
"analytics": "7c47c2bc-b97e-4014-85ae-b0c99b5750b4"
}
} }

View File

@ -4,7 +4,7 @@
export const environment = { export const environment = {
production: false, production: false,
apiBaseUrl: "http://10.0.1.26:8000/api/", apiBaseUrl: "http://localhost:8000/api/",
appTitle: "Paperless-ng", appTitle: "Paperless-ng",
version: "DEVELOPMENT" version: "DEVELOPMENT"
}; };