Merge branch 'master' of github.com:board3/Board3-Portal into cleanup/tabs

Browse Source

Conflicts:
	root/includes/acp/acp_portal.php
	root/language/de/mods/info_acp_portal.php
	root/language/en/mods/info_acp_portal.php

...

This commit is contained in:

Marc Alexander

2013-01-04 16:59:37 +01:00

parent f948811044 8854bb4a4b

commit 0b4eafdd9e

3 changed files with 553 additions and 462 deletions

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

1013

root/includes/acp/acp_portal.php

File diff suppressed because it is too large Load Diff