diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-16 06:57:01 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-16 06:57:01 -0800 |
| commit | 42550321ffd40328efa8b3bd8ec627ae219cf005 (patch) | |
| tree | 7556abe8a8d6416b34541e01d098f21959e34b4c /actions/version.php | |
| parent | 23a8645a394e2e27997638d03801aab380b84420 (diff) | |
| parent | 1ef8efe4c5624e7df38ce66187719038594cd828 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/version.php')
| -rw-r--r-- | actions/version.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actions/version.php b/actions/version.php index c1f673c45..b6593e5ed 100644 --- a/actions/version.php +++ b/actions/version.php @@ -266,5 +266,6 @@ class VersionAction extends Action 'Craig Andrews', 'mEDI', 'Brett Taylor', - 'Brigitte Schuster'); + 'Brigitte Schuster', + 'Brion Vibber'); } |