Merge
Merge
Change new reversion setting to be opt-in instead of opt-out.
backout aa850efe2315
backout eff95dec6799
Moved the MEDIA_LIBRARY_PER_SITE setting from filebrowser_safe into Mezzanine so it's documented. It allows per-site filebrowser root directories.
Bump filebrowser/grappelli versions.
Bump version to 1.4.0
Added tag 1.4.0 for changeset 90e95e46b33a
Update automated changelog, settings docs, model graphs, requirements.
Remove unnecessary permission from live_settings module. Closes #568.
Merge branch 'master' into feature/double-parent-slug-fix
Test slug after setting parent of an unsaved page with autogenerated slug.
Bum filebroswer_safe to 0.2.16
Merge
Merge
Prefix BLOG_USE_FEATURED_IMAGE in blog templates with settings., otherwise it always evalutes to False.

--HG--
branch : bugfix
Merged in joshcartme/mezzanine/bugfix (pull request #37)

Prefix BLOG_USE_FEATURED_IMAGE in blog templates with settings.
Fix site permissions lookup for non-superusers in admin sites drop-down.
Merge