Skip to content

Conversation

@skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Oct 1, 2019

After #17263

@@ -1,237 +0,0 @@
<!--
Copy link
Member

Choose a reason for hiding this comment

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

Should these really be removed?

Copy link
Member

Choose a reason for hiding this comment

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

@skjnldsv did you forgot to git add after rename?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, it's because when I rebased, @ChristophWurst's migration of settings to apps was understood by the auto rebase, so the files I edited before were moved into the apps folder too.
But since I also renamed the files in /settings, it did not understood they needed to be replaced in the new /apps/settings location.

Copy link
Member Author

Choose a reason for hiding this comment

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

@skjnldsv skjnldsv requested a review from rullzer October 2, 2019 08:17
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 2, 2019
@skjnldsv skjnldsv merged commit ecfa6f7 into master Oct 3, 2019
@skjnldsv skjnldsv deleted the fix/settings/users-cleanup branch October 3, 2019 06:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug feature: users and groups

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants