2745 commits

Author	SHA1	Message	Date
Evan Almloff	29c6d4608d	add documentation to the routable derive	2023-07-13 16:23:31 -07:00
niedzwiedzw	337697a886	test with forked version of debug-cell	2023-07-13 20:12:28 +02:00
Evan Almloff	c6ddee6f21	remove the extract macro	2023-07-12 16:20:44 -06:00
Jonathan Kelley	b25501af48	Merge pull request #1139 from Demonthos/add-onunmount-hook ... Add on unmount hook	2023-07-12 14:26:56 -07:00
Jonathan Kelley	17f2de81d6	Remove indexmap from core	2023-07-12 14:22:47 -07:00
Jonathan Kelley	5ceb4cc11e	Merge branch 'master' into timeout-count	2023-07-12 13:41:36 -07:00
niedzwiedzw	60d6137f39	better display for locations in panic messages	2023-07-12 16:36:17 +02:00
niedzwiedzw	9154b0f8ea	pass the information on previous caller on clone	2023-07-12 16:24:39 +02:00
niedzwiedzw	af091c5bf8	turns out Result combinators are not marked with #[trace_caller], so it must be written without function nesting in order to work	2023-07-12 16:20:19 +02:00
niedzwiedzw	3fa519563e	prevent inlining	2023-07-12 12:27:17 +02:00
Miles Murgaw	120fccc53d	fix: full & hot reload	2023-07-12 02:09:13 -04:00
Jonathan Kelley	f4b3be1b13	Merge pull request #940 from Demonthos/make-widgets-cross-framework	2023-07-11 20:47:01 -07:00
Miles Murgaw	5bc9e4556b	feat: custom mkcert paths	2023-07-11 23:01:37 -04:00
niedzwiedzw	760d93716f	also track previous caller in the in debug mode to show the conflicting borrow	2023-07-12 02:53:48 +02:00
niedzwiedzw	9da32d5465	oh yeah, tracking itself should also be debug-only	2023-07-12 01:53:00 +02:00
Miles Murgaw	b47e4fedcc	feat: default web.https config	2023-07-11 19:49:41 -04:00
niedzwiedzw	b8c14ce35c	make location diagnostics optional (only available in debug mode)	2023-07-12 01:38:50 +02:00
niedzwiedzw	43e3304eaf	track caller for easier debugging	2023-07-12 01:19:20 +02:00
niedzwiedzw	f159779af4	make thiserror a workspace dependency everywhere else	2023-07-11 22:54:24 +02:00
Miles Murgaw	d83b00ff0f	feat: mkcert	2023-07-11 16:38:34 -04:00
Miles Murgaw	ffb056798a	revision: organize	2023-07-11 15:51:56 -04:00
niedzwiedzw	469a7ac0af	better diagnostics for use_shared_state	2023-07-11 21:41:52 +02:00
Miles Murgaw	db93252faf	feat: cli use local certificate	2023-07-11 00:25:16 -04:00
Evan Almloff	0636e94f37	fix clippy	2023-07-10 19:34:45 -05:00
ealmloff	39ec5f498c	Merge branch 'master' into router-typesafe	2023-07-10 19:16:39 -05:00
Evan Almloff	831bcfd8e7	Fix warp fullstack adapter	2023-07-10 19:14:13 -05:00
Evan Almloff	0e83d48c04	Fix salvo fullstack builds	2023-07-10 18:48:55 -05:00
Kaid	e39d8708fa	Changed directory to webkitdirectory in bool_attrs definitions.	2023-07-10 17:19:11 +08:00
Jonathan Kelley	37f9f38187	Merge pull request #1170 from DioxusLabs/jk/move-vscode-extension ... Extract the vscode extension into its own module with wasm	2023-07-08 20:43:34 -07:00
Jonathan Kelley	e235683242	Bump version and make clippy happy	2023-07-08 19:44:33 -07:00
Jonathan Kelley	c6a5061615	bump version	2023-07-08 19:36:54 -07:00
Jonathan Kelley	d1697642bc	Update docs on extension	2023-07-08 19:36:02 -07:00
Jonathan Kelley	f9267fb71f	dont add wasm bindgen to cargo	2023-07-08 19:28:47 -07:00
Jonathan Kelley	8d27bb6236	don't add wasmbindgen	2023-07-08 19:28:39 -07:00
Jonathan Kelley	e96fd1ce57	Add a little bit of docs and change activation event	2023-07-08 19:27:25 -07:00
Jonathan Kelley	b5312732ba	Get wasm loading in extension	2023-07-08 18:53:43 -07:00
Jonathan Kelley	f59cacb2a0	Get wasm bundling working	2023-07-08 14:24:01 -07:00
Evan Almloff	73a45fb113	fix incremental router cache	2023-07-08 12:22:54 -07:00
Evan Almloff	d94316f7dd	fix formatting	2023-07-08 11:03:16 -07:00
Evan Almloff	6a3198ef85	cargo fix axum	2023-07-08 10:58:04 -07:00
Evan Almloff	1e5c57dd16	cargo fix	2023-07-08 10:57:44 -07:00
Evan Almloff	7c2bf4c5ed	fix formatting	2023-07-08 10:56:10 -07:00
Evan Almloff	fd98b51dfe	fix auth example	2023-07-08 10:42:15 -07:00
Evan Almloff	27b0c2683b	create auth example	2023-07-08 10:37:28 -07:00
Evan Almloff	453d087ed6	fix prop serialization	2023-07-08 09:13:24 -07:00
Marc Espín	32d4472bfd	fix: Remove duplicated doc links and improved some descriptions (#1167)	2023-07-08 11:04:27 -05:00
Evan Almloff	f0d1346652	remove unsafe from fullstack and ssr	2023-07-07 19:15:25 -07:00
Evan Almloff	206ab4cdb2	fix formatting	2023-07-07 19:05:15 -07:00
Evan Almloff	576bc61855	fix playwrite tests	2023-07-07 19:03:25 -07:00
Evan Almloff	aa26c086de	fix clippy	2023-07-07 18:41:22 -07:00
Evan Almloff	41f9c480c8	remove old references to server context	2023-07-07 18:39:18 -07:00
Evan Almloff	05fb8c1e91	Merge branch 'master' into router-typesafe	2023-07-07 18:31:48 -07:00
Jonathan Kelley	9fe7dc9b91	clippy	2023-07-07 18:28:07 -07:00
Evan Almloff	14883bb711	add server function middleware	2023-07-07 18:25:45 -07:00
Jonathan Kelley	3f74b10e7c	Feat: add dx as a package and move plugin to feature	2023-07-07 18:17:42 -07:00
Jonathan Kelley	1489492ec4	Reuse existing slots in provide context	2023-07-07 12:18:15 -07:00
Jonathan Kelley	3a1b22aec2	Use linear scans on contexts	2023-07-07 12:04:09 -07:00
Evan Almloff	c49c75cb60	remove props compression	2023-07-07 11:08:27 -07:00
Evan Almloff	7597068af6	integrate extractors with the macro	2023-07-07 11:03:59 -07:00
Evan Almloff	4f6e6a7c0d	add extractors to server-fn	2023-07-06 17:54:05 -07:00
Jonathan Kelley	47513e8b9e	Use boxes instead of bumpslab for hooks	2023-07-06 12:43:04 -07:00
Evan Almloff	523be82965	fix clippy	2023-07-06 12:14:40 -07:00
Evan Almloff	1110026d54	allow nested routers	2023-07-06 11:52:17 -07:00
Jon Kelley	911d1b4b2f	Merge pull request #1146 from traxys/master ... Add a helper macro for properties & async	2023-07-06 11:34:34 -07:00
Evan Almloff	e883e8d0dd	fix static generation example compiling	2023-07-06 11:24:52 -07:00
Jonathan Kelley	4abf996b86	fix clippy hinting around trait	2023-07-06 10:57:52 -07:00
Evan Almloff	b7ea3580c2	add static generation hydrated example	2023-07-06 10:52:09 -07:00
Jonathan Kelley	d56fabfe9a	Merge branch 'master' into feat/window_close_behaviour	2023-07-06 10:50:27 -07:00
traxys	f2c1c05792	Add a helper macro for properties & async ... The to_owned macro is helpful to handle hooks with async components, but when using properties it can be problematic because `cx` will be moved in the async block, and will result in a compilation error. This adds a new helper that allows to make either hooks or properties owned.	2023-07-06 15:18:19 +02:00
Jonathan Kelley	e5014cd754	Merge branch 'master' into jk/fix-mobile-touch-interaction	2023-07-05 15:33:50 -07:00
Jonathan Kelley	b5ccb56038	Fix clippy	2023-07-05 15:33:25 -07:00
Jonathan Kelley	60a873a49c	leave hotreload	2023-07-05 15:20:54 -07:00
Jonathan Kelley	10a3b228f6	Add some logging and debug	2023-07-05 15:19:26 -07:00
Jonathan Kelley	ea3b199eb2	Android build working too	2023-07-05 14:35:08 -07:00
Jonathan Kelley	5506c568c0	move to newer wry	2023-07-05 13:44:24 -07:00
Jonathan Kelley	2ce8ded74d	FIx desktop for android	2023-07-05 12:49:41 -07:00
Jonathan Kelley	2ad85c9b28	Add a custom index.html for the viewport stuff	2023-07-05 12:06:24 -07:00
Miles Murgaw	a5aa7db3da	fix: trigger it now?	2023-07-05 12:52:54 -04:00
Evan Almloff	f53dd5c181	remove logging	2023-07-04 11:54:41 -07:00
Evan Almloff	e7c3047aa1	apply headers to axum adapter	2023-07-04 09:19:22 -07:00
Benedikt Terhechte	6a705b6a0e	add functionality	2023-07-04 14:47:45 +02:00
Benedikt Terhechte	0ec30345d4	add required dependency	2023-07-04 14:47:36 +02:00
ealmloff	d1cd4851aa	Merge branch 'DioxusLabs:master' into add-onunmount-hook	2023-07-03 12:09:13 -07:00
Jon Kelley	a75223cd88	Merge pull request #1140 from DioxusLabs/jk/stub-out-ios ... Stub out File input and RFD on iOS	2023-07-03 10:16:30 -07:00
Jon Kelley	6a05fce39a	Merge pull request #1142 from torsteingrindvik/trailing-comma-span ... Change missing trailing comma span to be more helpful	2023-07-02 14:02:59 -07:00
marc2332	052ae145bf	updated docs	2023-07-02 23:00:26 +02:00
Marc Espín	cb73343865	fix: Fix stop_propagation example (#1143)	2023-07-02 12:04:49 -05:00
Torstein Grindvik	a3169ac17b	Change missing trailing comma span to point to span where comma is missing from ... Signed-off-by: Torstein Grindvik <torstein.grindvik@nordicsemi.no>	2023-07-02 15:19:03 +02:00
Evan Almloff	040055ba9d	compress assets by default in the launch macro	2023-06-30 19:22:43 -07:00
Evan Almloff	cbeaa07be0	create static_routes helper	2023-06-30 18:51:33 -07:00
Evan Almloff	b927e2fec8	change server_config -> serve_config	2023-06-30 18:48:12 -07:00
Jonathan Kelley	3658698064	put webview in rc	2023-06-30 14:39:38 -07:00
Evan Almloff	b334444711	formatting	2023-06-30 14:09:19 -07:00
Jonathan Kelley	e77a14dbf7	Remove RFD from input crate	2023-06-30 13:59:59 -07:00
Jonathan Kelley	4f22fe3ca8	Stub out files and RFD on ios	2023-06-30 13:59:48 -07:00
Evan Almloff	a6e87cf340	fix tests	2023-06-30 12:56:22 -07:00
Evan Almloff	5c7b1a742f	remove debug regression	2023-06-30 12:49:37 -07:00
Evan Almloff	cf1b801e7d	fix shadowing issue	2023-06-30 12:49:21 -07:00
Jonathan Kelley	6512c153dd	Fix merge errors	2023-06-30 12:48:25 -07:00
Evan Almloff	81d32800f8	fix widget events with form event updates	2023-06-30 12:46:47 -07:00
Evan Almloff	d99a5f3338	Merge branch 'master' into make-widgets-cross-framework	2023-06-30 12:44:15 -07:00
Jon Kelley	bfd7562ddb	Merge branch 'master' into feat/native-core-optional-deps	2023-06-30 12:30:39 -07:00
Jon Kelley	a0b89de4ca	Merge pull request #1057 from ndarilek/master ... Add richer API for describing global shortcut accelerators.	2023-06-30 12:27:00 -07:00
Jon Kelley	86402d3e23	Merge pull request #1077 from Demonthos/end-to-end-testing ... create end to end tests using playwright	2023-06-30 12:23:31 -07:00
Jon Kelley	7f1e99ade1	Merge pull request #1064 from Demonthos/expand-fuzzing ... Expanded fuzzing	2023-06-30 12:21:54 -07:00
Jon Kelley	e3b4021d34	Merge pull request #898 from Demonthos/make-use-eval-web-Rc ... Make web and desktop use_eval compatible	2023-06-30 12:15:22 -07:00
Jon Kelley	abccc7463f	Merge pull request #1010 from Demonthos/fix-onload-event ... Fix the onload event	2023-06-30 12:14:35 -07:00
Jon Kelley	282d2cba26	Merge branch 'master' into update-crossterm-rink	2023-06-30 12:13:28 -07:00
Jon Kelley	3985bd664b	Merge pull request #1084 from marc2332/patch-6 ... fix: Properly drop UseFuture's values to avoid leaking memory	2023-06-30 12:12:09 -07:00
Jon Kelley	4145e50bbf	Merge pull request #1104 from Demonthos/fix-booleans-with-boolean-attributes ... Fix boolean attributes with raw boolean values	2023-06-30 12:11:22 -07:00
Jon Kelley	6f38c765e5	Merge pull request #877 from Demonthos/fix-component-attribute-formatting ... Don't accept raw attributes in components without trailing commas	2023-06-30 12:10:57 -07:00
Jon Kelley	014bdef744	Merge pull request #945 from ProfXwing/return-context ... make new_window return desktop context instead of webview	2023-06-30 12:10:03 -07:00
Evan Almloff	60b25e9c2f	add on unmount hook	2023-06-30 08:54:08 -07:00
Miles Murgaw	2ef62a9160	fix: rustfmt	2023-06-30 10:50:09 -04:00
Miles Murgaw	2c8c601579	fix: clippy	2023-06-30 10:48:38 -04:00
Miles Murgaw	4ab8519af6	replace: broken test with working test	2023-06-30 10:13:46 -04:00
Nolan Darilek	c84e028bd6	Add richer API for describing global shortcut accelerators.	2023-06-30 08:10:48 -05:00
Evan Almloff	8f67d0aafd	make creating rsx nodes from macros possible	2023-06-29 12:52:27 -07:00
Marc Espín	f4e1d78d7a	fix(docs): Fix dioxus-hooks crate description (#1134)	2023-06-29 10:27:54 -05:00
Marc Espín	20c088b990	fix: Remove conflicting rustfmt config for cli (#1135)	2023-06-29 10:17:10 -05:00
Evan Almloff	f5c60eeb4c	make fullstack helpers compatable with prerendering	2023-06-28 18:48:42 -07:00
Jonathan Kelley	ec0fce3aef	Update install location for CLI	2023-06-28 17:39:03 -07:00
Jonathan Kelley	4b1cc4eb92	Merge remote-tracking branch 'cli/master' into jk/add-cli-to-mainline	2023-06-28 17:22:36 -07:00
Jonathan Kelley	a9d7b4d32a	Prepare CLI for move into mainline	2023-06-28 17:21:23 -07:00
xinglixing	fb227943ae	Fix: bump liveview salvo version to 0.44.1. (#1224) (#1130)	2023-06-28 14:10:18 -05:00
Evan Almloff	a7f7aad947	fix errors for nested routes	2023-06-28 11:27:11 -07:00
Marc Espín	e413ea4019	Merge branch 'master' into feat/improved-docs	2023-06-28 19:21:27 +02:00
Evan Almloff	7b1f0c9412	Merge branch 'master' into router-typesafe	2023-06-28 08:56:07 -07:00
Jon Kelley	90f80e4dc2	Fix cargo doc by using a fixed variant of interprocess (#1129) ... * fix docs compilation * dont change random codeblock	2023-06-27 19:40:41 -05:00
Evan Almloff	0600a1bb49	simpilify static generation example	2023-06-27 16:06:44 -07:00
Evan Almloff	914767892c	allow child routers to have fields	2023-06-27 15:56:47 -07:00
Jon Kelley	07dd9c275f	Merge pull request #1060 from Demonthos/fix-macos-hot-reloading ... Fix restarting MacOs hot reloading after a forced exit	2023-06-27 15:32:46 -07:00
marc2332	8a2f9f3fcb	feat(docs): Improved shared state, use_effect and use_memo docs	2023-06-28 00:15:00 +02:00
Jon Kelley	dfa4d8d989	Merge pull request #1105 from Demonthos/workspace-dependancies ... Workspace Dependancies	2023-06-27 10:17:12 -07:00
Evan Almloff	4fba279291	fix imports in the launch macro	2023-06-27 09:28:24 -07:00
Evan Almloff	0eb3b3d47e	fix render links assuming prelude was imported	2023-06-26 17:33:21 -07:00
Jason Schein	eb631f4077	Update fermi badge links. (#1109)	2023-06-26 19:29:49 -05:00
Evan Almloff	2da1f7faa7	allow nested routes	2023-06-26 16:08:53 -07:00
Evan Almloff	6569827b97	remove debug handler	2023-06-26 12:54:04 -07:00
Evan Almloff	c238c22eb5	add required features to fix tests	2023-06-24 14:07:48 -07:00
Evan Almloff	9ce16716ca	make clippy happy	2023-06-24 13:46:08 -07:00
Evan Almloff	e83866b986	fix router examples	2023-06-24 13:44:22 -07:00
Evan Almloff	a165e13564	add cache headers	2023-06-24 13:21:12 -07:00
Evan Almloff	1e5c220736	expose wry background color option	2023-06-24 10:25:24 -07:00
Evan Almloff	b8806b0854	remove brackets around address	2023-06-23 18:56:20 -07:00
Evan Almloff	99674fcf94	create server launch macro	2023-06-23 18:23:03 -07:00
Evan Almloff	1704ee0068	router/fullstack/ssr intigration	2023-06-22 16:51:48 -07:00
Evan Almloff	495fd22bfd	Merge branch 'master' into router-typesafe	2023-06-22 12:52:11 -07:00
Evan Almloff	07215924bc	WIP: fullstack router intigration	2023-06-22 12:51:10 -07:00
Evan Almloff	28f875857e	add timestamps to incremental rendering	2023-06-22 12:13:51 -07:00
Evan Almloff	3d41dd95c9	remove logging	2023-06-21 18:51:40 -07:00
Evan Almloff	3a690877d1	basic incremental renderer	2023-06-21 18:36:32 -07:00
DianQK	535435a4cf	Fix the issue of duplicate unique ID for atoms using newtype. ... The MergeFunctionsPass in LLVM merges identical functions (https://rust.godbolt.org/z/3nnr9nMne), resulting in the same function addresses.	2023-06-21 21:50:10 +08:00
DianQK	9731640434	Revert "fix: use typeid of atoms for their unique ID (#558)" ... This reverts commit bf9901a6cd.	2023-06-21 20:07:49 +08:00
Marc Espín	a3654fd0b8	Update use_shared_state.rs	2023-06-20 19:13:34 +02:00
Jonathan Kelley	d93d11262d	bump interpreter version	2023-06-20 11:57:24 -04:00
Evan Almloff	da44b7a3f2	fix salvo server function handler example	2023-06-19 16:11:59 -05:00
Evan Almloff	158852e5a0	make regestering server functions optional	2023-06-19 16:08:46 -05:00
Evan Almloff	c39f55920c	fix CI tests	2023-06-19 14:57:58 -05:00
Evan Almloff	5f873511c5	use workspace dependancies	2023-06-19 14:29:11 -05:00
Evan Almloff	bc063c58b7	throttle history updates to 100ms	2023-06-19 12:04:06 -05:00
Evan Almloff	fe626c67bd	fix switching between routes with different hooks	2023-06-19 10:54:25 -05:00
Evan Almloff	4f672ff4bb	fix boolean attributes with raw boolean values	2023-06-19 10:19:35 -05:00
James Fletcher	6e5fbcff63	Increase the number of tokio channels for the query engine from 8 to 1000. (#1095)	2023-06-19 09:26:02 -05:00
Nick Mosher	b48cfe5730	fix: Remove dbg that was causing TUI rendering problems (#1085)	2023-06-19 08:29:29 -05:00
Evan Almloff	04f066ddb7	fix clippy	2023-06-19 08:22:50 -05:00
ealmloff	cf9ed74303	Merge branch 'master' into fix-onload-event	2023-06-19 08:16:40 -05:00
ealmloff	d9a1b702df	Merge branch 'DioxusLabs:master' into expand-fuzzing	2023-06-19 07:55:49 -05:00
Evan Almloff	33f0e30369	fix default web history provider	2023-06-18 19:24:31 -05:00
Evan Almloff	199eb7a2db	don't reverse layouts	2023-06-18 18:32:44 -05:00
ealmloff	c33d1f5dc2	Merge branch 'DioxusLabs:master' into router-typesafe	2023-06-14 16:22:24 +03:00
Marc Espín	1546fce485	fix: Properly drop UseFuture's values to avoid leaking memory	2023-06-10 18:26:02 +02:00
Jonathan Kelley	f63220019d	bump liveview version	2023-06-08 15:08:40 +00:00
Jon Kelley	d34c2e395f	Merge pull request #1065 from Demonthos/fix-events-on-placeholders ... Fix panic when events trigger on placeholders	2023-06-08 14:52:18 +00:00
Jon Kelley	5b0b23f96b	Merge pull request #1062 from Demonthos/fix-raw-strings-autofmt ... Fix autoformatting raw strings	2023-06-08 14:51:13 +00:00
Kaid	277436f673	Changed underlying directory attribute to webkitdirectory, fixed attribute parsing to properly toggle it.	2023-06-06 08:06:27 +08:00
Evan Almloff	741ff97882	create end to end tests using playwright	2023-06-05 13:48:58 -05:00
Kaid	37a8fb5391	Add directory support for file input.	2023-06-05 16:47:04 +08:00
Miles Murgaw	0fec47db72	Fix liveview interpreter JS (#1073) ... * fix: liveview interpreter js * fix: rustfmt	2023-06-04 21:34:43 -05:00
Miles Murgaw	510c242883	fix: move bool_attrs to common.js (#1072)	2023-06-04 14:15:46 -05:00
Miles Murgaw	d09c92beda	Add initial_value attribute & fix static special attribute handling (#1063) ... * feat & fix: initial_value attribute, special attribute handling * revision: rename js file * fix: rustfmt * fix: clippy * fix: desktop not finding common.js * fix: desktop failing to render Missed a single ``this.SetAttributeInner`` as it was now ``setAttributeInner`` Javascript didn't even throw any errors about this smh * revision: no need for match statement	2023-06-04 11:29:34 -05:00
Evan Almloff	db44721c3d	update all element ids	2023-06-02 14:23:16 -05:00
Evan Almloff	9d5f115e30	fix events triggering on placeholders causing panics	2023-06-02 14:21:49 -05:00
Evan Almloff	fe162f4a79	expanded fuzzing	2023-06-02 14:20:03 -05:00
Evan Almloff	a9307e57e6	fix CI	2023-06-02 12:33:47 -05:00
Evan Almloff	d9e0b9a918	fix autoformatting raw strings	2023-06-02 12:03:56 -05:00
Evan Almloff	60abafb381	fix macos hot reloading on forced exit	2023-06-02 10:30:40 -05:00
Evan Almloff	577f99e68c	link to the router guide in the readme	2023-06-01 17:50:42 -05:00
Evan Almloff	5117d7380a	fix clippy	2023-06-01 17:49:12 -05:00
Evan Almloff	bc99d9b01a	fix formatting	2023-06-01 17:48:43 -05:00
Evan Almloff	b5a2f0d6cb	finish router refrence	2023-06-01 17:31:13 -05:00
Jonathan Kelley	563a2b0953	Bump interpreter	2023-06-01 22:39:43 +02:00
Evan Almloff	07446386e6	fix external router examples	2023-06-01 14:10:33 -05:00
Evan Almloff	67992f7da9	create cfg factory	2023-06-01 13:13:50 -05:00
Evan Almloff	037a248ad9	fix queries	2023-06-01 11:09:51 -05:00
Evan Almloff	2f473f7c97	make serde optional	2023-06-01 11:03:44 -05:00
Evan Almloff	fe601e2a48	restore navigator	2023-06-01 09:45:31 -05:00
Evan Almloff	92755a381d	Merge branch 'upstream' into router-typesafe	2023-05-31 17:16:27 -05:00
Evan Almloff	ed0184685d	fix doc links	2023-05-31 17:14:40 -05:00
Evan Almloff	ece8f0fb22	general cleanup	2023-05-31 17:12:52 -05:00