forgot part of merge conflict
dev
1 parent dbcc008 commit 741c92e43c41418b07e6f0094aa1bb7162485546
@xsrust xsrust authored on 27 Jul 2017
Showing 1 changed file
View
app/controllers/plans_controller.rb