Skip to content

Rename "user" to "account" in description - #390

Merged
AndyScherzinger merged 3 commits into
masterfrom
rename-user-account
Apr 26, 2023
Merged

Rename "user" to "account" in description#390
AndyScherzinger merged 3 commits into
masterfrom
rename-user-account

Conversation

@PVince81

Copy link
Copy Markdown
Member

No description provided.

@jancborchardt jancborchardt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@nickvergessen
nickvergessen removed their request for review September 26, 2022 12:30
@nickvergessen

Copy link
Copy Markdown
Member

Language string freeze happened

@jancborchardt

Copy link
Copy Markdown
Member

Could we resolve the conflicting files and merge it then? :)

Comment thread README.md Outdated
Comment thread README.md Outdated
PVince81 and others added 3 commits April 25, 2023 10:30
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger

Copy link
Copy Markdown
Member

Rebased and conflicts resolved.

@AndyScherzinger

Copy link
Copy Markdown
Member

/backport to stable25

@AndyScherzinger

Copy link
Copy Markdown
Member

/backport to stable26

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants