Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Squashed commit of the following: #19

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Squashed commit of the following: #19

wants to merge 1 commit into from

Conversation

tmpayton
Copy link

This will bring dev up to date with master,

commit 172bdfb
Merge: a594159 affc584
Author: Corinne Lucas [email protected]
Date: Tue Mar 12 09:45:49 2024 -0400

Merge pull request #17 from fecgov/upgrade-python-v3.10

upgrade python v3.10

commit affc584
Author: tmpayton [email protected]
Date: Thu Feb 29 11:10:10 2024 -0500

upgrade python v3.10

commit a594159
Merge: 30a40d3 70da715
Author: Priya Kasireddy [email protected]
Date: Tue Jan 9 09:23:03 2024 -0500

Merge pull request #15 from fecgov/add-count-type

Add is_count_exact to paginator schema

commit 70da715
Author: tmpayton [email protected]
Date: Wed Dec 20 13:44:37 2023 -0500

add count type to paginator schema

commit 30a40d3
Merge: b6805b7 fc060c9
Author: Priya Kasireddy [email protected]
Date: Mon Jul 31 18:15:54 2023 -0400

Merge pull request #14 from fecgov/upgrade-marshmallow-v3

upgrade marshmallow-v3

commit fc060c9
Author: tmpayton [email protected]
Date: Mon Jul 31 18:14:08 2023 -0400

upgrade marshmallow-v3

commit b6805b7
Merge: d4d363c 003d6f4
Author: Priya Kasireddy [email protected]
Date: Mon Jul 31 18:11:31 2023 -0400

Merge pull request #13 from fecgov/feature/upgrade-marshmallow-v3

upgrade marshmallow v3

commit 003d6f4
Author: tmpayton [email protected]
Date: Mon Jul 31 18:09:17 2023 -0400

upgrade marshmallow v3

commit d4d363c
Merge: 1db0147 a77faac
Author: Corinne Lucas [email protected]
Date: Mon Jul 31 17:58:13 2023 -0400

Merge pull request #11 from fecgov/feature/upgrade-marshmallow

 upgrade to marshmallow v3

commit a77faac
Author: tmpayton [email protected]
Date: Thu Jul 20 14:32:16 2023 -0400

upgrade to marshmallow v3

commit 1db0147
Merge: 0f4a530 c963871
Author: tmpayton [email protected]
Date: Mon Jul 17 11:54:45 2023 -0400

Merge pull request #9 from fecgov/revert-8-develop

Revert "Marshmallow 3 changes, release branch"

commit c963871
Author: Corinne Lucas [email protected]
Date: Mon Jul 17 11:51:05 2023 -0400

Revert "Marshmallow 3 changes, release branch"

commit 0f4a530
Merge: 3180169 2c9f1c5
Author: Priya Kasireddy [email protected]
Date: Mon Jul 17 09:43:13 2023 -0400

Merge pull request #8 from fecgov/develop

Marshmallow 3 changes, release branch

commit 3180169
Merge: 73fe389 b778939
Author: Priya Kasireddy [email protected]
Date: Wed Nov 6 09:55:29 2019 -0500

Merge pull request #4 from fecgov/develop

merge develop-->master

commit 172bdfb
Merge: a594159 affc584
Author: Corinne Lucas <[email protected]>
Date:   Tue Mar 12 09:45:49 2024 -0400

    Merge pull request #17 from fecgov/upgrade-python-v3.10

    upgrade python v3.10

commit affc584
Author: tmpayton <[email protected]>
Date:   Thu Feb 29 11:10:10 2024 -0500

    upgrade python v3.10

commit a594159
Merge: 30a40d3 70da715
Author: Priya Kasireddy <[email protected]>
Date:   Tue Jan 9 09:23:03 2024 -0500

    Merge pull request #15 from fecgov/add-count-type

    Add is_count_exact to paginator schema

commit 70da715
Author: tmpayton <[email protected]>
Date:   Wed Dec 20 13:44:37 2023 -0500

    add count type to paginator schema

commit 30a40d3
Merge: b6805b7 fc060c9
Author: Priya Kasireddy <[email protected]>
Date:   Mon Jul 31 18:15:54 2023 -0400

    Merge pull request #14 from fecgov/upgrade-marshmallow-v3

    upgrade marshmallow-v3

commit fc060c9
Author: tmpayton <[email protected]>
Date:   Mon Jul 31 18:14:08 2023 -0400

    upgrade marshmallow-v3

commit b6805b7
Merge: d4d363c 003d6f4
Author: Priya Kasireddy <[email protected]>
Date:   Mon Jul 31 18:11:31 2023 -0400

    Merge pull request #13 from fecgov/feature/upgrade-marshmallow-v3

    upgrade marshmallow v3

commit 003d6f4
Author: tmpayton <[email protected]>
Date:   Mon Jul 31 18:09:17 2023 -0400

    upgrade marshmallow v3

commit d4d363c
Merge: 1db0147 a77faac
Author: Corinne Lucas <[email protected]>
Date:   Mon Jul 31 17:58:13 2023 -0400

    Merge pull request #11 from fecgov/feature/upgrade-marshmallow

     upgrade to marshmallow v3

commit a77faac
Author: tmpayton <[email protected]>
Date:   Thu Jul 20 14:32:16 2023 -0400

    upgrade to marshmallow v3

commit 1db0147
Merge: 0f4a530 c963871
Author: tmpayton <[email protected]>
Date:   Mon Jul 17 11:54:45 2023 -0400

    Merge pull request #9 from fecgov/revert-8-develop

    Revert "Marshmallow 3 changes, release branch"

commit c963871
Author: Corinne Lucas <[email protected]>
Date:   Mon Jul 17 11:51:05 2023 -0400

    Revert "Marshmallow 3 changes, release branch"

commit 0f4a530
Merge: 3180169 2c9f1c5
Author: Priya Kasireddy <[email protected]>
Date:   Mon Jul 17 09:43:13 2023 -0400

    Merge pull request #8 from fecgov/develop

    Marshmallow 3 changes, release branch

commit 3180169
Merge: 73fe389 b778939
Author: Priya Kasireddy <[email protected]>
Date:   Wed Nov 6 09:55:29 2019 -0500

    Merge pull request #4 from fecgov/develop

    merge develop-->master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant