Merge pull request #1 from SimpleMachines/release-2.1

Updating local repo to master
Typo

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #646 from Oldiesmann/release-2.1

Typo
! Typo

Signed-off-by: John Rayes <live627@gmail.com>
! Remove useless function param

Signed-off-by: John Rayes <live627@gmail.com>
Remove the shrink header code, don't touch anything else. #422

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #653 from live627/t

! Typo
Merge pull request #654 from live627/d

! Remove useless function param
Remove the settings

Signed-off-by: Suki <suki@missallsunday.com>
Latest news goes elsewhere, dunno where exactly.

Signed-off-by: Suki <suki@missallsunday.com>
Split moderator notes from the rst of blocks

Signed-off-by: Suki <suki@missallsunday.com>
Add the time, I have no idea whats the best palce for it...

Signed-off-by: Suki <suki@missallsunday.com>
Remove the time from author link

Signed-off-by: Suki <suki@missallsunday.com>
! Fix #660: Paid subscription can fail using custom currency code

Signed-off-by: John Rayes <live627@gmail.com>
! Antispam questions should support multiple languages and multiple answers per question. Note that this does not, currently, support upgrading existing questions but likely it would be better if the admin were to review their questions anyway. Apologies to JS purists; I'm sure the JS could be better handled but someone better than I should probably do that.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge branch 'release-2.1' of https://github.com/Arantor/SMF2.1 into release-2.1

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #661 from live627/s

! Fix #660: Paid subscription can fail using custom currency code
Merge remote-tracking branch 'SMF/release-2.1' into release-2.1
Merge pull request #657 from MissAllSunday/moderation_center

Moderation center
Merge pull request #655 from MissAllSunday/Collapse_header

Remove the shrink header code, don't touch anything else. #422