diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-05-31 20:07:18 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-05-31 20:07:18 +0200 |
| commit | b0eb7768bd3236eed62639be3b74a1736f6872c7 (patch) | |
| tree | 6cde5f4f36c422608847208d87b83c1db89b6558 /phpBB/docs | |
| parent | edefd110879ed96c04c4b4c6310aa7d752ac88c1 (diff) | |
| parent | 791c4136f74877d67e053bef7153209550d3e5ae (diff) | |
| download | forums-b0eb7768bd3236eed62639be3b74a1736f6872c7.tar forums-b0eb7768bd3236eed62639be3b74a1736f6872c7.tar.gz forums-b0eb7768bd3236eed62639be3b74a1736f6872c7.tar.bz2 forums-b0eb7768bd3236eed62639be3b74a1736f6872c7.tar.xz forums-b0eb7768bd3236eed62639be3b74a1736f6872c7.zip | |
Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Nils Adermann (2) and Andreas Fischer (1)
* develop-olympus:
[ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
Diffstat (limited to 'phpBB/docs')
| -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 e945af8efa..f0b4e25549 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -23,6 +23,7 @@ involved in phpBB. phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010] + Arty (Vjacheslav Trushkin) bantu (Andreas Fischer) imkingdavid (David King) igorw (Igor Wiedler) |