diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-16 20:46:12 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-16 20:46:12 +0200 |
| commit | 904d2049c8f0d528216b4c24941e7dab66ec09ce (patch) | |
| tree | 4e9e332a5d4b7a6c2543a3852450c0d6db6cfd60 /phpBB/docs | |
| parent | 591217a903460a81df4c19850f5d99c2e9d10b1d (diff) | |
| parent | 6d7e30ae995fe0791c2bced0974b0445fa769ee9 (diff) | |
| download | forums-904d2049c8f0d528216b4c24941e7dab66ec09ce.tar forums-904d2049c8f0d528216b4c24941e7dab66ec09ce.tar.gz forums-904d2049c8f0d528216b4c24941e7dab66ec09ce.tar.bz2 forums-904d2049c8f0d528216b4c24941e7dab66ec09ce.tar.xz forums-904d2049c8f0d528216b4c24941e7dab66ec09ce.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Move rxu and nickvergessen to Developers
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/AUTHORS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index e886cd5a89..84677c4e15 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -29,14 +29,14 @@ phpBB Developers: A_Jelly_Doughnut (Josh Woody) DavidMJ (David M.) dhn (Dominik Dröscher) kellanved (Henry Sudhof) + nickvergessen (Joas Schilling) + rxu (Ruslan Uzdenov) Terrafrost (Jim Wigginton) ToonArmy (Chris Smith) Contributions by: Brainy (Cullen Walsh) leviatan21 (Gabriel Vazquez) - nickvergessen (Joas Schilling) Raimon (Raimon Meuldijk) - rxu (Ruslan Uzdenov) Xore (Robert Hetzler) |