Merge remote-tracking branch 'upstream/dev' into feature/updated-nav-bar

This commit is contained in:
Michael Shamoon
2021-01-01 12:16:55 -08:00
54 changed files with 1079 additions and 411 deletions

View File

@@ -2,5 +2,5 @@ export const environment = {
production: true,
apiBaseUrl: "/api/",
appTitle: "Paperless-ng",
version: "0.9.10"
version: "0.9.11"
};

View File

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