Merge release Beta 1 into stable #21

Merged
Felisp merged 35 commits from dev into stable 2024-08-13 17:48:09 +02:00
Showing only changes of commit 2325b154d1 - Show all commits

View file

@ -66,5 +66,5 @@
val2 (get defaults k)] val2 (get defaults k)]
(if (and (map? val1) (if (and (map? val1)
(map? val2)) (map? val2))
{k (map-deep-merge-missing val1 val2)} {k (map-apply-defaults val1 val2)}
{k (nil?-else val2 val1)}))))) {k (nil?-else val2 val1)})))))