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

crohr · crohr · commit 5690d259c822 · 2018-01-04T01:10:50.000Z
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

-Original file line number
+Diff line change
     end
   end
 -end
 +end