aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Gołębiowski-Owczarek <m.goleb@gmail.com>2021-02-19 20:57:54 +0100
committerGitHub <noreply@github.com>2021-02-19 20:57:54 +0100
commit19c628675dadc714616af975969694267f3840df (patch)
treea774aa57df9ece3971e9c0d84a17d887e8336711
parent91b6fc3f08a6256ebb8006f96661db163aa8b5bc (diff)
downloadjquery-ui-19c628675dadc714616af975969694267f3840df.tar.gz
jquery-ui-19c628675dadc714616af975969694267f3840df.zip
Build: Rename the primary branch `master` to `main`
Closes gh-1944
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--package.json2
2 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 53922478d..648084ad9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,10 +53,10 @@ cd jquery-ui
git remote add upstream git://github.com/jquery/jquery-ui.git
```
-* Get in the habit of pulling in the "upstream" master to stay up to date as jQuery UI receives new commits.
+* Get in the habit of pulling in the "upstream" main branch to stay up to date as jQuery UI receives new commits.
```bash
-git pull upstream master
+git pull upstream main
```
### Environment: Recommended Setup
diff --git a/package.json b/package.json
index a5a992de4..063989f17 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"homepage": "http://jqueryui.com",
"author": {
"name": "jQuery Foundation and other contributors",
- "url": "https://github.com/jquery/jquery-ui/blob/master/AUTHORS.txt"
+ "url": "https://github.com/jquery/jquery-ui/blob/main/AUTHORS.txt"
},
"main": "ui/widget.js",
"maintainers": [
/option> Nextcloud server, a safe home for all your data: https://github.com/nextcloud/serverwww-data
aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php
blob: 58ae6b13aed9f7fd5990fe8393b51b45e021006c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88