Merge Master into the BTM branch. #1099
Merged
Conversation
This file contains 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
…gDate Handle empty endingDate (phm)
test remove
undo last remove
changed to use routematcher to get page name instead
test change
update dcs client version
add function to auto follow discussion
Adding i18n files for emergency forms
Dummy PR as Andy's request
Deploy PHM. Updating Tom's changes to secrets file upstream into master
|
Merging Master into BTM to get it running with the new code. Note: this removes @Zahra-8d's changes which i've pulled out so they can be checked and re-added at a later time. |
AndyatFocallocal
added a commit
that referenced
this pull request
Aug 3, 2021
Merge pull request #1099 from focallocal/master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Note this removes Zahra's 'follow' edits on the Maps. These should be reviewed and put back in if still operational.