Merge branch 'master' into vdom

2016-02-22 15:28:07 -05:00
parent fdf0047f56 cab5dd09d3
commit 026bba1876
62 changed files with 1516 additions and 176 deletions
@@ -80,7 +80,7 @@ Discourse.SiteSettingsOriginal = {
  "tos_accept_required":false,
  "faq_url":"",
  "allow_restore":false,
-  "maximum_backups":7,
+  "maximum_backups":5,
  "version_checks":true,
  "suppress_uncategorized_badge":true,
  "min_search_term_length":3,