Skip to content

Commit cc521d9

Browse files
committed
Merge branch 'develop' into fix/curl_multiple_header_sections_after_redirects
2 parents 8909dbd + 9727f10 commit cc521d9

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

admin/framework/.gitignore

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ _modules/*
100100
.idea/
101101
*.iml
102102

103-
# Netbeans
104-
nbproject/
105-
build/
106-
nbbuild/
107-
dist/
108-
nbdist/
109-
nbactions.xml
110-
nb-configuration.xml
111-
.nb-gradle/
103+
# NetBeans
104+
/nbproject/
105+
/build/
106+
/nbbuild/
107+
/dist/
108+
/nbdist/
109+
/nbactions.xml
110+
/nb-configuration.xml
111+
/.nb-gradle/
112112

113113
# Sublime Text
114114
*.tmlanguage.cache

admin/starter/.gitignore

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ _modules/*
100100
.idea/
101101
*.iml
102102

103-
# Netbeans
104-
nbproject/
105-
build/
106-
nbbuild/
107-
dist/
108-
nbdist/
109-
nbactions.xml
110-
nb-configuration.xml
111-
.nb-gradle/
103+
# NetBeans
104+
/nbproject/
105+
/build/
106+
/nbbuild/
107+
/dist/
108+
/nbdist/
109+
/nbactions.xml
110+
/nb-configuration.xml
111+
/.nb-gradle/
112112

113113
# Sublime Text
114114
*.tmlanguage.cache

0 commit comments

Comments
 (0)