diff options
| author | Ruben Calvo <rubencm@gmail.com> | 2018-10-28 17:00:58 +0000 |
|---|---|---|
| committer | Ruben Calvo <rubencm@gmail.com> | 2018-10-28 17:00:58 +0000 |
| commit | dc109b195261e83465914e2457bd16e8158d9c21 (patch) | |
| tree | 082e64974eca8a90660e7c114a4f7665ce998ea6 /phpBB | |
| parent | 68b3c5d1f0930f423bc060132da6be0e2153088d (diff) | |
| parent | 09f17a438e7508be4b65f0c490fe8bcbe3628607 (diff) | |
| download | forums-dc109b195261e83465914e2457bd16e8158d9c21.tar forums-dc109b195261e83465914e2457bd16e8158d9c21.tar.gz forums-dc109b195261e83465914e2457bd16e8158d9c21.tar.bz2 forums-dc109b195261e83465914e2457bd16e8158d9c21.tar.xz forums-dc109b195261e83465914e2457bd16e8158d9c21.zip | |
Merge remote-tracking branch 'marc/ticket/15857' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CREDITS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 4c8974d7c9..fc089f9e02 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -29,6 +29,7 @@ phpBB Developers: bantu (Andreas Fischer) Hanakin (Michael Miday) MichaelC (Michael Cullum) Nicofuma (Tristan Darricau) + rubencm (Rubén Calvo) For a list of phpBB Team members, please see: http://www.phpbb.com/about/team/ |