Homec4science

solved merge conflicts

Authored by borel on Mar 30 2023, 17:28.

Description

solved merge conflicts

Details

Committed
borelMar 30 2023, 17:28
Pushed
borelMar 30 2023, 17:28
Parents
rOACCT1e5826361f11: maybe like this...
rOACCT834c1e2e7eff: make URL optional for ConditionSet API serializers
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
1e5826361f11borel
maybe like this... 
Mar 30 2023
7eec7f1026e3borel
trying to fix error 502 on API writing *condition objects 
Mar 30 2023
ab7e3664d0f1borel
nested writable *condition serialzers 
Mar 30 2023
778df63dbef1borel
allow POSTing multiple *condition relations through the API 
Mar 30 2023
04774942334cborel
allow POSTing multiple *condition relations through the API 
Mar 30 2023
f38311edcb4fborel
make URL really optional for ConditionSet API serializers 
Mar 29 2023
ebe27dd38745borel
make URL optional for ConditionSet API serializers 
Mar 29 2023