This repository has been archived by the owner on Apr 28, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into acceptHandling
Conflicts: library/Zend/Http/Header/AbstractAccept.php library/Zend/Http/Header/AcceptEncoding.php library/Zend/Http/Header/AcceptLanguage.php tests/Zend/Http/Header/AcceptCharsetTest.php tests/Zend/Http/Header/AcceptEncodingTest.php tests/Zend/Http/Header/AcceptLanguageTest.php tests/Zend/Http/Header/AcceptTest.php
- Loading branch information
75 parents
1392a56
+
eff94af
+
baa6f68
+
b8d6e5f
+
cf90e76
+
a38e673
+
ddc5b11
+
203f4f2
+
f755a1b
+
7b4bdc5
+
de1dabc
+
cffd7da
+
e68b46a
+
6a4a61e
+
a495238
+
22ee4fd
+
7c48789
+
88fc985
+
33867a8
+
72cc708
+
1253b9d
+
b527198
+
9f385cb
+
9681d38
+
9ff4ea7
+
9dcc02b
+
a3b5a44
+
49aa6e1
+
785d144
+
6cb9145
+
98ba294
+
1a26005
+
6a37670
+
53069e2
+
cdc28f8
+
7ed9b6d
+
6aa8b3f
+
b08f0db
+
c6ffcad
+
2e788ed
+
5fa8668
+
331098b
+
11a5300
+
d15662e
+
a652577
+
113da58
+
ac8c434
+
51dd55f
+
b8f65f9
+
5ab3ccd
+
3c9d616
+
34eee47
+
1fc6a29
+
0f06888
+
781c1e1
+
bfb1248
+
adb0888
+
20476b6
+
f0f3028
+
fd934a8
+
039bd26
+
70f3e5a
+
3d9849b
+
118afdb
+
029c839
+
31a4435
+
fa239e0
+
18c2969
+
28b9d7b
+
34e166a
+
9e19c9d
+
1645624
+
0f36602
+
32da7d8
+
9cd65f3
commit 10a2ceb
Showing
1 changed file
with
1 addition
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters