Skip to content

Tta 83 solving conflicts #912

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Aug 5, 2022
Merged

Tta 83 solving conflicts #912

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d07db70
Tta 50 error when editing an entry (#907)
wilc0519 Jul 29, 2022
63d8d3d
Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903)
jisazac Aug 1, 2022
c32641c
Set copy of package.json and npm install before copying all other pro…
GuLozada99 Aug 2, 2022
96d05b2
feat: TTA-113 Set a new logo for TT - version 2 (#909)
jimmyjaramillo Aug 2, 2022
e32b521
chore(release): 1.74.0 [skip ci]nn
semantic-release-bot Aug 2, 2022
1347ef3
Solving merge conflicts
Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Solving merge conflicts
  • Loading branch information
Rodrigo Lins committed Aug 5, 2022
commit 1347ef336abc6d30aeaf69463b452b1b37c22430

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.