! rename to help with cp
! more renaming
! Request URL cleaner for pagination failed in certain cases.

Conflicts:
	changelog
	smf1/Sources/PortalBlocks.php
! Portal action was not considered a portal page.

Conflicts:
	smf1/Sources/Subs-Portal.php
 ! Duplicate language string index caused a capitalization mistake.
! Updated the outdated Top Member Stats.

Conflicts:
	smf1/Sources/PortalBlocks.php
! Allow for RSS feed content without cutoff.

Conflicts:
	smf1/Sources/PortalBlocks.php
! Force admin restriction on PHP pages.

Conflicts:
	smf1/Sources/PortalAdminPages.php
! Make blocks always visible when they don't have titles.

Conflicts:
	smf1/Themes/default/Portal.template.php
! Shoutbox actions shouldn't be tracked, at all.

Conflicts:
	install1-1.xml
	modification.xml
! rename for merge
! Standalone portal activity wasn't being logged.

Conflicts:
	changelog
	shared/PortalStandalone.php
	smf1/Sources/Subs-Portal.php
	smf1/install1-1.xml
! Updated the outdated Gallery block.

Conflicts:
	smf1/Sources/PortalBlocks.php
! Guests shouldn't be able to have any portal specific permissions.

Conflicts:
	smf1/install1-1.xml
	smf2/install.xml
! Use the standard time format for future events.

Conflicts:
	smf1/Sources/PortalBlocks.php
! Collapsing categories should highlight the forum button.

Conflicts:
	smf1/install1-1.xml
 ! Redirection boards have redirects instead of topics and posts.
 ! Styling improvements to vertical forum menu block.
 ! Blocks required an additional container for better spacing.
 ! Vertical alignment for collapse and add block icons.