diff options
| author | Gina Häußge <gina@octoprint.org> | 2022-10-17 18:18:46 +0300 |
|---|---|---|
| committer | Gina Häußge <gina@octoprint.org> | 2022-10-17 18:18:46 +0300 |
| commit | 26ad4f72697f0ebebc3d478dc6446adbc55b0848 (patch) | |
| tree | 3b002ec8f221b1b9922a6435dd8c362b1edf7c55 | |
| parent | c1a2c0ef7ada78b1999c50951851f5871fa06ee5 (diff) | |
| parent | fd3c16f058eb289c96f4cb2a9503528c7172fad4 (diff) | |
Merge branch 'maintenance' into devel
| -rw-r--r-- | .versioneer-lookup | 6 | ||||
| -rw-r--r-- | SUPPORTERS.md | 4 | ||||
| -rw-r--r-- | src/octoprint/plugins/errortracking/__init__.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.versioneer-lookup b/.versioneer-lookup index dbd4b7952..a92dc720a 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -24,10 +24,10 @@ maintenance 1.9.0 fa2c4680cca0d1d6b46e6c1ed68ceea4d9b79afb pep440-dev fix/.* 1.9.0 fa2c4680cca0d1d6b46e6c1ed68ceea4d9b79afb pep440-dev improve/.* 1.9.0 fa2c4680cca0d1d6b46e6c1ed68ceea4d9b79afb pep440-dev -# staging/bugfix is the branch for preparation of the 1.8.5 bugfix release +# staging/bugfix is the branch for preparation of the 1.8.6 bugfix release # so are any bug/... branches -staging/bugfix 1.8.5 27a576e352a9b3d9abee89ab92cd02012c0e39dd pep440-dev -bug/.* 1.8.5 27a576e352a9b3d9abee89ab92cd02012c0e39dd pep440-dev +staging/bugfix 1.8.6 395354212c2bb65b37b303de171418f6475ca346 pep440-dev +bug/.* 1.8.6 395354212c2bb65b37b303de171418f6475ca346 pep440-dev # staging/maintenance is currently the branch for preparation of 1.8.0rc6 # so is regressionfix/... diff --git a/SUPPORTERS.md b/SUPPORTERS.md index c54300973..4edb73897 100644 --- a/SUPPORTERS.md +++ b/SUPPORTERS.md @@ -19,6 +19,7 @@ thanks to everyone who contributed! * Christian Wolf * Christian Würthner * Christoph Sigrist + * Codense Consulting Oy * Creality3D * DeltaMaker 3D Printers * Dennis Breining @@ -43,7 +44,6 @@ thanks to everyone who contributed! * Makespace Madrid * Mark Greenwald * Mark Walker - * Matt Van Itallie * Michael Aumock * Mike Kershaw * Mosaic Manufacturing @@ -68,4 +68,4 @@ thanks to everyone who contributed! * TJ Horner * Ulrich Kempken -and 2188 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)! +and 2145 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)! diff --git a/src/octoprint/plugins/errortracking/__init__.py b/src/octoprint/plugins/errortracking/__init__.py index a9c4295b7..7e0fc5647 100644 --- a/src/octoprint/plugins/errortracking/__init__.py +++ b/src/octoprint/plugins/errortracking/__init__.py @@ -18,10 +18,10 @@ from octoprint.util.version import ( ) SENTRY_URL_SERVER = ( - "https://289cde39ce7d410f82280cb5b0bb62e8@o118517.ingest.sentry.io/1373987" + "https://ed6946a2c4f344738768ac7f34ce27df@o118517.ingest.sentry.io/1373987" ) SENTRY_URL_COREUI = ( - "https://af2c0c034c9044889b8cf06163ea00fc@o118517.ingest.sentry.io/1374096" + "https://1b37bf389cbc4150890838f99c42adab@o118517.ingest.sentry.io/1374096" ) SETTINGS_DEFAULTS = { |