gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-18 22:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix from rebase

Browse source 
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
This commit is contained in:
Stella Rouzi 2014-08-12 22:11:07 +03:00
parent f7ef401be7
commit f5081813d9
6 changed files with 29 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/conference_controller.rb
View file

@ -190,7 +190,6 @@ module Admin
def edit
@conferences = Conference.all
@conference = Conference.find_by(short_title: params[:id])
@date_string = date_string(@conference.start_date, @conference.end_date)
respond_to do |format|
format.html