Skip to content

Commit 8304daf

Browse files
committed
Merge branch 'master' into cc0-ro-legalcode
2 parents e442522 + 98624a4 commit 8304daf

191 files changed

Lines changed: 3685 additions & 1014 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Pipfile.lock

Lines changed: 0 additions & 639 deletions
This file was deleted.

config/creativecommons.org.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,9 @@
267267

268268
RewriteEngine on
269269

270+
# WordPress XML-RPC
271+
RewriteRule ^/xmlrpc.php /wordpress/xmlrpc.php [L]
272+
270273
# Make sure the Bassel memorial donation page has the right utm_campaign
271274
# Ideally we would set this in Gravity Forms - Rob.
272275

docroot/legalcode/by-nc-nd_4.0.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
<option value="legalcode.pl">polski</option>
157157
<option value="legalcode.pt">português</option>
158158
<option value="legalcode.ru">русский</option>
159+
<option value="legalcode.sl">Slovenščina</option>
159160
<option value="legalcode.sv">svenska</option>
160161
<option value="legalcode.tr">Türkçe</option>
161162
<option value="legalcode.uk">українська</option>
@@ -368,6 +369,7 @@ <h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International P
368369
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
369370
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
370371
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
372+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
371373
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
372374
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
373375
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,

docroot/legalcode/by-nc-nd_4.0_ar.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
<option value="legalcode.pl">polski</option>
157157
<option value="legalcode.pt">português</option>
158158
<option value="legalcode.ru">русский</option>
159+
<option value="legalcode.sl">Slovenščina</option>
159160
<option value="legalcode.sv">svenska</option>
160161
<option value="legalcode.tr">Türkçe</option>
161162
<option value="legalcode.uk">українська</option>
@@ -328,6 +329,7 @@ <h3>مؤسسة المشاع الإبداعي نَسْبُ الـمُصنَّف،
328329
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
329330
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
330331
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
332+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
331333
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
332334
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
333335
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,

docroot/legalcode/by-nc-nd_4.0_cs.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
<option value="legalcode.pl">polski</option>
154154
<option value="legalcode.pt">português</option>
155155
<option value="legalcode.ru">русский</option>
156+
<option value="legalcode.sl">Slovenščina</option>
156157
<option value="legalcode.sv">svenska</option>
157158
<option value="legalcode.tr">Türkçe</option>
158159
<option value="legalcode.uk">українська</option>
@@ -327,6 +328,7 @@ <h3>Creative Commons Uveďte původ-Neužívejte komerčně-Nezpracovávejte 4.0
327328
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
328329
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
329330
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
331+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
330332
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
331333
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
332334
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,

docroot/legalcode/by-nc-nd_4.0_de.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
<option value="legalcode.pl">polski</option>
153153
<option value="legalcode.pt">português</option>
154154
<option value="legalcode.ru">русский</option>
155+
<option value="legalcode.sl">Slovenščina</option>
155156
<option value="legalcode.sv">svenska</option>
156157
<option value="legalcode.tr">Türkçe</option>
157158
<option value="legalcode.uk">українська</option>
@@ -327,6 +328,7 @@ <h3>Creative Commons Namensnennung-Nicht kommerziell-Keine Bearbeitungen 4.0 Int
327328
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
328329
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
329330
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
331+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
330332
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
331333
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
332334
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,

docroot/legalcode/by-nc-nd_4.0_el.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
<option value="legalcode.pl">polski</option>
156156
<option value="legalcode.pt">português</option>
157157
<option value="legalcode.ru">русский</option>
158+
<option value="legalcode.sl">Slovenščina</option>
158159
<option value="legalcode.sv">svenska</option>
159160
<option value="legalcode.tr">Türkçe</option>
160161
<option value="legalcode.uk">українська</option>
@@ -665,6 +666,7 @@ <h3>Creative Commons Αναφορά-Μη Εμπορική Χρήση-Όχι Πα
665666
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
666667
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
667668
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
669+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
668670
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
669671
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
670672
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,

docroot/legalcode/by-nc-nd_4.0_es.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
<option value="legalcode.pl">polski</option>
151151
<option value="legalcode.pt">português</option>
152152
<option value="legalcode.ru">русский</option>
153+
<option value="legalcode.sl">Slovenščina</option>
153154
<option value="legalcode.sv">svenska</option>
154155
<option value="legalcode.tr">Türkçe</option>
155156
<option value="legalcode.uk">українська</option>
@@ -326,6 +327,7 @@ <h3>Creative Commons Atribución/Reconocimiento-NoComercial-SinDerivados 4.0 Lic
326327
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
327328
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
328329
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
330+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
329331
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
330332
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
331333
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,

docroot/legalcode/by-nc-nd_4.0_eu.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
<option value="legalcode.pl">polski</option>
153153
<option value="legalcode.pt">português</option>
154154
<option value="legalcode.ru">русский</option>
155+
<option value="legalcode.sl">Slovenščina</option>
155156
<option value="legalcode.sv">svenska</option>
156157
<option value="legalcode.tr">Türkçe</option>
157158
<option value="legalcode.uk">українська</option>
@@ -329,6 +330,7 @@ <h3>Creative Commons Aitortu-EzKomertziala-LanEratorririkGabe 4.0 Nazioartekoa L
329330
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
330331
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
331332
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
333+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
332334
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
333335
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
334336
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,

docroot/legalcode/by-nc-nd_4.0_fi.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
<option value="legalcode.pl">polski</option>
157157
<option value="legalcode.pt">português</option>
158158
<option value="legalcode.ru">русский</option>
159+
<option value="legalcode.sl">Slovenščina</option>
159160
<option value="legalcode.sv">svenska</option>
160161
<option value="legalcode.tr">Türkçe</option>
161162
<option value="legalcode.uk">українська</option>
@@ -376,6 +377,7 @@ <h3>Creative Commons Nimeä-EiKaupallinen-EiMuutoksia 4.0 Kansainvälinen Julkin
376377
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
377378
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
378379
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
380+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
379381
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
380382
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
381383
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,

0 commit comments

Comments
 (0)