non-screwed version...

Signed-off-by: Antes <antes@simplemachines.org>
! Warning status icons are part of the generic_icons sprite now (fixes #2274)

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

! Warning status icons are part of the generic_icons sprite now (fixes #...
Merge pull request #2277 from Antes/theme_fix

! convert mod page img tag to span tag
Save a query if we know there aren't any items to display
#2269

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #2278 from Antes/theme_fix

! Change color of topic_display p
I swear I already added the new cust_fields positions on PersonalMessage.template :(

Signed-off-by: Suki <suki@missallsunday.com>
and of course the usual boo boo...

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #2282 from Antes/theme_fix

Sprite tweaks (css only)
! minimize css/js

Signed-off-by: Antes <antes@simplemachines.org>
Merge branch 'release-2.1' of git@github.com:SimpleMachines/SMF2.1.git into stuff

Conflicts:
	Themes/default/PersonalMessage.template.php

Signed-off-by: Suki <suki@missallsunday.com>
Remove $modSettings['integrate_autotask_include'] the new callable column should be enough

Signed-off-by: Suki <suki@missallsunday.com>
Normalize files on Sources folder
always funny to read how git complais about not having a new line at the end of the file :P

Signed-off-by: Suki <suki@missallsunday.com>
Normalize template files

Signed-off-by: Suki <suki@missallsunday.com>
Change version to 2.1 Beta 1

Signed-off-by: Suki <suki@missallsunday.com>
The echo must follow the if statement

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #2287 from MissAllSunday/scheduled_task_redundancy

Remove $modSettings['integrate_autotask_include']
Merge pull request #2286 from MissAllSunday/stuff

Stuff
Merge pull request #2247 from Antes/slider

Content Slider
! Let's base Arizona time off its capital, not a Canadian town

Signed-off-by: John Rayes <live627@gmail.com>