diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-07-02 22:55:00 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-02 22:55:00 +0200 |
| commit | 868179c295b07c5bc9a2eccab9d9dd645a9b0561 (patch) | |
| tree | 43bd44e2daf5a343685444ad8c45768fbd356342 | |
| parent | b83c623480b4284cfe457c8b59a03c8c1761fad0 (diff) | |
| parent | a6d66b2ab032e9b71596e03fef7814bd80bda2d8 (diff) | |
| download | forums-868179c295b07c5bc9a2eccab9d9dd645a9b0561.tar forums-868179c295b07c5bc9a2eccab9d9dd645a9b0561.tar.gz forums-868179c295b07c5bc9a2eccab9d9dd645a9b0561.tar.bz2 forums-868179c295b07c5bc9a2eccab9d9dd645a9b0561.tar.xz forums-868179c295b07c5bc9a2eccab9d9dd645a9b0561.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12120] Add nicofuma to the developers
Conflicts:
phpBB/docs/AUTHORS
| -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 a4ba4cb87c..edb6361b2a 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -28,6 +28,7 @@ phpBB Developers: bantu (Andreas Fischer) imkingdavid (David King) marc1706 (Marc Alexander) nickvergessen (Joas Schilling) + nicofuma (Tristan Darricau) prototech (Cesar Gallegos) For a list of phpBB Team members, please see: |