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 Creative Commons licenses to 4.0. fixes #1286 #1317

Merged
merged 1 commit into from Sep 7, 2015
Merged

update Creative Commons licenses to 4.0. fixes #1286 #1317

merged 1 commit into from Sep 7, 2015

Conversation

@@ -14,23 +14,23 @@
'url' => 'http://creativecommons.org/licenses/publicdomain/',
);
$license['cc-by'] = array(
'name' => 'CC Attribution 3.0 Unported',
'url' => 'http://creativecommons.org/licenses/by/3.0/',
'name' => 'CC Attribution 4.0 International',
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there a difference between 'Unported' and 'International'?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks, that is a clear answer.

@Klap-in
Copy link
Collaborator

Klap-in commented Aug 27, 2015

👍

@polyzen polyzen closed this Sep 5, 2015
@polyzen polyzen deleted the CC4.0 branch September 5, 2015 19:15
@polyzen polyzen restored the CC4.0 branch September 5, 2015 22:20
@polyzen polyzen reopened this Sep 5, 2015
@Klap-in
Copy link
Collaborator

Klap-in commented Sep 5, 2015

Hey @polyzen, why are you closing this?

@scrutinizer-notifier
Copy link

The inspection completed: No new issues

@polyzen
Copy link
Contributor Author

polyzen commented Sep 5, 2015

Sorry about that, @Klap-in :p I forgot this hasn't been merged yet

Edit: For the second time.. #1308

splitbrain added a commit that referenced this pull request Sep 7, 2015
update Creative Commons licenses to 4.0. fixes #1286
@splitbrain splitbrain merged commit 1fab701 into dokuwiki:master Sep 7, 2015
@polyzen polyzen deleted the CC4.0 branch September 7, 2015 19:04
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.

None yet

4 participants