diff options
author | Tristan Darricau <github@nicofuma.fr> | 2017-04-19 17:08:16 +0200 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2017-04-19 17:08:16 +0200 |
commit | 7cc2f8aa43eefda2a271b3b6e53c82a53beb988a (patch) | |
tree | 0b47b3d157bfb2582d80c46cfb60561a24ca7857 /phpBB/phpbb/filesystem | |
parent | 7a4d6209fdd5a378a232856c81f0cb6708f7b6e5 (diff) | |
parent | d550f925ab0232e1630fca5dc4c62f024abb7165 (diff) | |
download | forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.tar forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.tar.gz forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.tar.bz2 forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.tar.xz forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.zip |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15151] Use redirected link for consistency
[ticket/15151] ACP Cookie settings explanatory text
[ticket/15151] ACP Cookie settings add explanatory text where it was missing
Diffstat (limited to 'phpBB/phpbb/filesystem')
0 files changed, 0 insertions, 0 deletions