Merge branch 'develop-olympus' into develop

Browse Source

* 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

...

This commit is contained in:

Joas Schilling

2014-03-14 13:59:46 +01:00

parent 7b08a483fd bdce7abc84

commit c743e28b94

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available