Merge upstream (#81)

2017-07-15 14:33:15 -07:00
parent 08d021916d 695439775e
commit 09cfc079b0
213 changed files with 2714 additions and 1364 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -21,6 +21,7 @@ defaults: &defaults
  auto_play_gif: false
  delete_modal: true
  system_font_ui: false
+  noindex: false
  notification_emails:
    follow: false
    reblog: false