diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:59:46 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-14 13:59:46 +0100 |
| commit | c743e28b94e2764b23c6e7da0e8e8d3452aec71e (patch) | |
| tree | b3a5d9ea807d8944099de77f1584f74ff72008d4 | |
| parent | 7b08a483fd364138a573bb5f403fb6176c2b5c04 (diff) | |
| parent | bdce7abc846a4afc5f0e7bb45e1e2597c3feb909 (diff) | |
| download | forums-c743e28b94e2764b23c6e7da0e8e8d3452aec71e.tar forums-c743e28b94e2764b23c6e7da0e8e8d3452aec71e.tar.gz forums-c743e28b94e2764b23c6e7da0e8e8d3452aec71e.tar.bz2 forums-c743e28b94e2764b23c6e7da0e8e8d3452aec71e.tar.xz forums-c743e28b94e2764b23c6e7da0e8e8d3452aec71e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12247] Makes static usernames work
[ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
Conflicts:
phpBB/includes/mcp/mcp_queue.php
0 files changed, 0 insertions, 0 deletions