diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-10-28 12:25:53 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-10-28 12:27:16 +0100 |
| commit | 9036edd935bef6e141c4d8b276f4a0dca01e6371 (patch) | |
| tree | 7a00f16eee724444050f907d800846fd22000ca6 /phpBB/includes/functions_acp.php | |
| parent | 087a5363bba7228f29d6075deb2a099cf9d25630 (diff) | |
| parent | fcc320e3852215a11b863d0108e16e2be998d5cc (diff) | |
| download | forums-9036edd935bef6e141c4d8b276f4a0dca01e6371.tar forums-9036edd935bef6e141c4d8b276f4a0dca01e6371.tar.gz forums-9036edd935bef6e141c4d8b276f4a0dca01e6371.tar.bz2 forums-9036edd935bef6e141c4d8b276f4a0dca01e6371.tar.xz forums-9036edd935bef6e141c4d8b276f4a0dca01e6371.zip | |
[ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2
* ticket/13234:
[ticket/13234] Fix conditions and CS
Conflicts:
phpBB/phpbb/session.php
PHPBB3-13234
Diffstat (limited to 'phpBB/includes/functions_acp.php')
0 files changed, 0 insertions, 0 deletions