Merge branch 'master' into fix-3278

2017-12-13 14:30:08 -08:00
parent 1c5c3b5f9f 8d5f1bccaf
commit 5da62eff8d
27 changed files with 312 additions and 79 deletions
@@ -0,0 +1,2 @@
+Rails.application.config.rakismet.key = Danbooru.config.rakismet_key
+Rails.application.config.rakismet.url = Danbooru.config.rakismet_url