Merge 5b3b054d0b into 05209260a4

2017-03-10 16:41:28 +00:00 · 2017-03-10 16:41:28 +00:00 · 75dc414dda
commit 75dc414dda
parent 05209260a4 5b3b054d0b
6 changed files with 6 additions and 6 deletions
--- a/app/controllers/admin/conferences_controller.rb
+++ b/app/controllers/admin/conferences_controller.rb
@ -167,7 +167,7 @@ module Admin

    def edit
      @conferences = Conference.all
-      @date_string = date_string(@conference.start_date, @conference.end_date)
+      @date_string = @conference.date_range_string
      respond_to do |format|
        format.html
        format.json { render json: @conference.to_json }