diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-02 18:51:59 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-05-02 18:51:59 +0200 |
| commit | 9401edecca401afa8365c78ec9ea0eab87ae8693 (patch) | |
| tree | 267033ca990c5521f53a8cbbe31f7301b349e9e9 /phpBB | |
| parent | b187031082aa41e5d2da5537ca403677dc7e05ce (diff) | |
| parent | cb2538dc84e79056a6b0065afd484b851011a80d (diff) | |
| download | forums-9401edecca401afa8365c78ec9ea0eab87ae8693.tar forums-9401edecca401afa8365c78ec9ea0eab87ae8693.tar.gz forums-9401edecca401afa8365c78ec9ea0eab87ae8693.tar.bz2 forums-9401edecca401afa8365c78ec9ea0eab87ae8693.tar.xz forums-9401edecca401afa8365c78ec9ea0eab87ae8693.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12120] Add Marc Alexander to AUTHORS
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 5ca52c19c0..29ee72caa3 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -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) |