1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympus

* nickvergessen/ticket/12120:
  [ticket/12120] Add Marc Alexander to AUTHORS
This commit is contained in:
Marc Alexander 2014-05-02 18:36:08 +02:00
commit cb2538dc84

View File

@ -26,6 +26,7 @@ phpBB Developers: bantu (Andreas Fischer)
dhruv.goel92 (Dhruv Goel)
EXreaction (Nathan Guse)
imkingdavid (David King)
marc1706 (Marc Alexander)
nickvergessen (Joas Schilling)
prototech (Cesar Gallegos)