Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/stable' into pkgr
Browse files Browse the repository at this point in the history
  • Loading branch information
crohr committed Jan 4, 2018
2 parents 2539e75 + 7c03b31 commit 5690d25
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion spec/controllers/topics_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.