Merge remote-tracking branch 'origin/stable' into pkgr

pkgr · Jan 4, 2018 · 5690d25 · 5690d25
2 parents 2539e75 + 7c03b31
commit 5690d25
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
@@ -1657,4 +1657,4 @@ def topics_controller_show_gen_perm_tests(expected, ctx)
     end
   end
 
-end
+end