Merge branch 'feature/scheduled_stats' into development

2015-09-14 21:58:16 -04:00
parent ceed96401b c1619c93e0
commit 34e02731e9
50 changed files with 9643 additions and 132 deletions
--- a/docs/releases/2.0.rst
+++ b/docs/releases/2.0.rst
@@ -267,6 +267,7 @@ Other changes
 * setting_view_permission added to the smart settings app. It is no longer required to be a super admin or staff user to see the setting values.
 * Removal of the CombinedSource class.
 * Reduction of text strings.
+* Statistics refactor; purgestatistics command

 Upgrading from a previous version
 ---------------------------------