Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12120] Add Marc Alexander to AUTHORS
This commit is contained in:
Marc Alexander 2014-05-02 18:51:59 +02:00
commit 9401edecca

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)