back-merge: release-2.134.1 → develop#1566
Open
JoshuaVulcan wants to merge 3 commits into
Open
Conversation
Hotfix: Fix timezone for time fields in v2 forms
JoshuaVulcan
changed the title
Contributor
|
@JoshuaVulcan this PR makes me nervous. I see some files I deleted and logic changes I made in #1535 that are already in develop being added back in the diff. Maybe that's the reason of the conflicts. I think develop already has a nice date time fixing that also cleans the ISO formats in: https://github.com/PADAS/das-web-react/pull/1535/changes#diff-0c7c8e675c002173ca17012eb15cf7357bb2a6350719e3a32ab472cc44d7fb8e Are you sure we need a back-merge here? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commits on release-2.134.1 not yet in develop:
Note: 3a08bd0 is a duplicate and has been fixed in develop.