Permalink
Browse files

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

  • Loading branch information...
crohr committed Jan 4, 2018
2 parents 2539e75 + 7c03b31 commit 5690d259c822d8e58ba7c5e65988b9158f3138fa
Showing with 1 addition and 1 deletion.
  1. +1 −1 spec/controllers/topics_controller_spec.rb
@@ -1657,4 +1657,4 @@ def topics_controller_show_gen_perm_tests(expected, ctx)
end
end
end
end

0 comments on commit 5690d25

Please sign in to comment.