solved merge conflicts
Description
Description
Details
Details
- Committed
borel Mar 30 2023, 17:28 - Pushed
borel Mar 30 2023, 17:28 - Parents
- rOACCT1e5826361f11: maybe like this...
rOACCT834c1e2e7eff: make URL optional for ConditionSet API serializers - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 1e5826361f11 | borel | maybe like this... | Mar 30 2023 | |||
| 7eec7f1026e3 | borel | trying to fix error 502 on API writing *condition objects | Mar 30 2023 | |||
| ab7e3664d0f1 | borel | nested writable *condition serialzers | Mar 30 2023 | |||
| 778df63dbef1 | borel | allow POSTing multiple *condition relations through the API | Mar 30 2023 | |||
| 04774942334c | borel | allow POSTing multiple *condition relations through the API | Mar 30 2023 | |||
| f38311edcb4f | borel | make URL really optional for ConditionSet API serializers | Mar 29 2023 | |||
| ebe27dd38745 | borel | make URL optional for ConditionSet API serializers | Mar 29 2023 |