diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-02 18:36:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-05-02 18:36:08 +0200 |
| commit | cb2538dc84e79056a6b0065afd484b851011a80d (patch) | |
| tree | 7e4efc316dd0b23df1228b6483e9011d2ab10f6a | |
| parent | c7450592d8a1b4de666d1a4025551a6711239689 (diff) | |
| parent | 797cb02f063ab38dd2f189af9d324bd155608c1e (diff) | |
| download | forums-cb2538dc84e79056a6b0065afd484b851011a80d.tar forums-cb2538dc84e79056a6b0065afd484b851011a80d.tar.gz forums-cb2538dc84e79056a6b0065afd484b851011a80d.tar.bz2 forums-cb2538dc84e79056a6b0065afd484b851011a80d.tar.xz forums-cb2538dc84e79056a6b0065afd484b851011a80d.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympus
* nickvergessen/ticket/12120:
[ticket/12120] Add Marc Alexander to AUTHORS
| -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 465c4de397..25d2849dbe 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) |