diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2012-04-12 14:37:47 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-04-12 14:37:47 +0200 |
| commit | f1f2ab92b15e57c182dadfd9f3cd606cff13946c (patch) | |
| tree | 8c562e1359ebdefc247c621d406cf860d6b9c006 /git-tools/merge.php | |
| parent | Merge remote-tracking branch 'github-bantu/ticket/10774' into develop-olympus (diff) | |
| parent | [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section. (diff) | |
| download | phpbb-f1f2ab92b15e57c182dadfd9f3cd606cff13946c.tar.gz phpbb-f1f2ab92b15e57c182dadfd9f3cd606cff13946c.tar.bz2 phpbb-f1f2ab92b15e57c182dadfd9f3cd606cff13946c.zip | |
Merge remote-tracking branch 'bantu/ticket/10788' into develop-olympus
* bantu/ticket/10788:
[ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
[ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
Diffstat (limited to 'git-tools/merge.php')
0 files changed, 0 insertions, 0 deletions