Merge remote-tracking branch 'refs/remotes/nicolas-raoul/master'

This commit is contained in:
misaochan 2016-05-27 18:15:52 +12:00
commit a79c4e9d1f
2 changed files with 3 additions and 1 deletions

View file

@ -47,7 +47,7 @@ This software is licensed under the [Apache License][5].
## Bugs ##
Please report any bugs [on Github][3].
Please report any bug [on Github][3].
## Code Structure ##

View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<licenses xmlns="https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses">
<license id="cc-by-4.0" template="cc-by-4.0" url="https://creativecommons.org/licenses/by/4.0/deed.$lang"/>
<license id="cc-by-sa-4.0" template="cc-by-sa-4.0" url="https://creativecommons.org/licenses/by-sa/4.0/deed.$lang"/>
<license id="cc-by-sa-3.0" template="cc-by-sa-3.0" url="https://creativecommons.org/licenses/by-sa/3.0/deed.$lang"/>
<license id="cc-by-sa-3.0-at" template="cc-by-sa-3.0-at" url="https://creativecommons.org/licenses/by-sa/3.0/at/deed.$lang"/>
<license id="cc-by-sa-3.0-de" template="cc-by-sa-3.0-de" url="https://creativecommons.org/licenses/by-sa/3.0/de/deed.$lang"/>