Skip to content

merge master into development - #480

Merged
edvaldoszy merged 54 commits into
developmentfrom
feat/conflict
Aug 6, 2026
Merged

edvaldoszy merged 54 commits into
developmentfrom
feat/conflict

Conversation

@edvaldoszy

Copy link
Copy Markdown
Collaborator

No description provided.

edvaldoszy added 30 commits May 22, 2025 23:12
…o de template e rotas para relatorio de locais de coleta, feat: relatório familias e genero (#112)
…, correções dos campos de taxonomia, correções na ficha tombo (#186)
…oleta e data tombo, tombo descrição e observação (#200)
edvaldoszy and others added 24 commits December 12, 2025 14:23
Co-authored-by: Moran <105233020+feliperm17@users.noreply.github.com>
Co-authored-by: Josue Modesto <91280773+JosueModesto@users.noreply.github.com>
Co-authored-by: Alisson Vieira <alisson.v3@hotmail.com>
@edvaldoszy
edvaldoszy merged commit 74036af into development Aug 6, 2026
4 checks passed
@edvaldoszy
edvaldoszy deleted the feat/conflict branch August 6, 2026 12:24
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