Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update content for 4.0, part 2 #1060

Merged
merged 47 commits into from
Dec 14, 2022
Merged

Update content for 4.0, part 2 #1060

merged 47 commits into from
Dec 14, 2022

Conversation

trwnh
Copy link
Member

@trwnh trwnh commented Nov 21, 2022

@trwnh trwnh mentioned this pull request Nov 24, 2022
@trwnh trwnh changed the title Fix small issues with #991 Update content for 4.0, part 2 Nov 26, 2022
@Gargron Gargron merged commit ffbe66a into mastodon:master Dec 14, 2022
@MFTabriz
Copy link

MFTabriz commented Dec 15, 2022

@Gargron @trwnh Squashing the commits while stripping the PR author’s info/attribution from the commit history does not look like a GFDL-compliant approach to me.

@trwnh trwnh mentioned this pull request Dec 16, 2022
@nemobis
Copy link
Contributor

nemobis commented Jan 24, 2023

Squashing the commits while stripping the PR author’s info/attribution from the commit history does not look like a GFDL-compliant approach

Currently this repository doesn't seem to state the copyright holders anywhere in the file contents, which means preserving git history is probably necessary at the moment for attribution, but as for this specific commit I wouldn't be so sure because it was probably purchased by Mastodon gGmbH, presumably with a copyright assignment or even a work-for-hire arrangement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants