Skip to content

Commit 713eb22

Browse files
authored
Merge branch 'master' into header-keyboard
2 parents 6df419b + 1159919 commit 713eb22

File tree

3 files changed

+43
-4
lines changed

3 files changed

+43
-4
lines changed

.browserslistrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
defaults
2+
not ie 11

.editorconfig

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 2
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
# Use 4 spaces for the Python files
13+
[*.py]
14+
indent_size = 4
15+
max_line_length = 80
16+
17+
# The JSON files contain newlines inconsistently
18+
[*.json]
19+
indent_size = 2
20+
insert_final_newline = true
21+
22+
# Minified JavaScript files shouldn't be changed
23+
[**.min.js]
24+
indent_style = 2
25+
insert_final_newline = ignore
26+
27+
# Makefiles always use tabs for indentation
28+
[Makefile]
29+
indent_style = tab
30+
31+
# Batch files use tabs for indentation
32+
[*.bat]
33+
indent_style = tab
34+
35+
[*.md]
36+
trim_trailing_whitespace = false
37+

databags/repos.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
},
230230
{
231231
"created": "2017-07-12T18:01:30",
232-
"description": "Mapping the commons towards an open ledger and cc search.",
232+
"description": "Note: Project is discontinued. Mapping the commons towards an open ledger and cc search.",
233233
"engineering_project": true,
234234
"english_name": "CC Catalog",
235235
"featured": false,
@@ -250,7 +250,7 @@
250250
},
251251
{
252252
"created": "2018-04-27T20:50:37",
253-
"description": "The Creative Commons Catalog API allows programmatic access to search for CC-licensed and public domain digital media.",
253+
"description": "Note: Project is discontinued. The Creative Commons Catalog API allows programmatic access to search for CC-licensed and public domain digital media.",
254254
"engineering_project": true,
255255
"english_name": "CC Catalog API",
256256
"featured": false,
@@ -289,7 +289,7 @@
289289
},
290290
{
291291
"created": "2018-07-06T00:51:38",
292-
"description": "CC Search is a search tool for CC-licensed and public domain content across the internet.",
292+
"description": "Note: Project is discontinued. CC Search is a search tool for CC-licensed and public domain content across the internet.",
293293
"engineering_project": true,
294294
"english_name": "CC Search",
295295
"featured": false,
@@ -447,7 +447,7 @@
447447
"Jest"
448448
],
449449
"url": "https://github.com/creativecommons/chooser",
450-
"website": "https://chooser-beta.creativecommons.org/"
450+
"website": "https://chooser-beta.creativecommons.org"
451451
},
452452
{
453453
"created": "2017-07-05T23:39:19",

0 commit comments

Comments
 (0)