|
Joas Schilling
|
f4898b9258c8365f3aae7fc945c3f156ec9f0ad4
f4898b9258c8365f3aae7fc945c3f156ec9f0ad4 |
Merge branch 'prep-release-3.1.2' into develop-ascraeus |
|
|
Joas Schilling
|
9c9623e47f179e2fee386e939d98e5428ac68a44
9c9623e47f179e2fee386e939d98e5428ac68a44 |
[prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev |
|
|
Joas Schilling
|
1ad0dd28f110a0b83bbd9f296757d729321f3ac8
1ad0dd28f110a0b83bbd9f296757d729321f3ac8 |
Merge branch 'develop-olympus' into prep-release-3.1.2 |
|
|
Joas Schilling
|
ff9b541070372cf4758b0ef538daa33e150a1886
m ff9b541070372cf4758b0ef538daa33e150a1886 |
Merge pull request #3180 from naderman/ticket/13376
[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3 |
|
|
Nils Adermann <naderman@naderman.de>
|
965042d015a0351303999b0196998be67d42dbae
m 965042d015a0351303999b0196998be67d42dbae |
[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
Also introduce a clear cookie message hardcoded just in case.
PHPBB3-13376 |
|