Skip to content

Commit

Permalink
Merge branch '1.2-dev' into 1412-optional-releases-guidance (conflict…
Browse files Browse the repository at this point in the history
…s due to removal of "status")
  • Loading branch information
jpmckinney committed Mar 27, 2024
2 parents c848382 + 1ebc554 commit 06fb413
Show file tree
Hide file tree
Showing 61 changed files with 931 additions and 953 deletions.
1 change: 0 additions & 1 deletion docs/examples/beneficial_ownership/award.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"awards": [
{
"id": "6031d3f9-f86b-462c-80b2-4a02c760ddcd",
"status": "active",
"date": "2021-06-07T00:00:00Z",
"value": {
"amount": 32191,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"awards": [
{
"id": "f867a510-0edf-11eb-a6ca-b5f4fa6e44dc",
"status": "active",
"date": "2020-10-18T12:21:56Z",
"value": {
"amount": 56660,
Expand Down
Loading

0 comments on commit 06fb413

Please sign in to comment.