diff options
author | Tristan Darricau <github@nicofuma.fr> | 2016-09-18 13:28:39 +0200 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2016-09-18 13:28:39 +0200 |
commit | 47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2 (patch) | |
tree | 99cea638307cb723d78e880d8799364468e75126 /phpBB/includes/acp/acp_language.php | |
parent | 631b0f2dba136194380d83586252f3b5456e8656 (diff) | |
parent | 27e33f39f7553d2f24fdeae004810493f063265d (diff) | |
download | forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.tar forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.tar.gz forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.tar.bz2 forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.tar.xz forums-47d2f34a1b9008332bcd27d5e855f1fc05ff1ab2.zip |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14788] Update CREDITS.txt
Diffstat (limited to 'phpBB/includes/acp/acp_language.php')
0 files changed, 0 insertions, 0 deletions