Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
dev
commit 22713a6ab508fbce0c178bf0b365de53ee19ff2d
2 parents a91a5b2 + 2244fcf
@xsrust xsrust authored on 14 Jun 2017
Showing 3 changed files
View
app/controllers/questions_controller.rb
View
app/views/questions/_add_question.html.erb
View
app/views/questions/_edit_question.html.erb