Merge nextcloud-alpha into master #2421
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
michielbdejong
requested review from
glpatcern,
ishank011,
labkode and
a team
as code owners
butonic
previously approved these changes
Jan 7, 2022
|
@michielbdejong is good, can you just rebased these two changes? |
michielbdejong
force-pushed
the
nextcloud-alpha-only
branch
2 times, most recently
from
a17b59e to
25eed37
Compare
michielbdejong
force-pushed
the
nextcloud-alpha-only
branch
from
25eed37 to
d391014
Compare
|
Squashed and rebased, awaiting tests. |
|
@labkode can you approve? |
labkode
approved these changes
Mar 14, 2022
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.
Merge just nextcloud-alpha into master (not the rest of edge yet).
This will be useful for making the CERN and PONDERSOURCE nodes of the ScienceMesh compatible with each other, without having to wait for all of
edgeto be merged intomaster.