Skip to content

Commit

Permalink
Merge branch 'release-0.9.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
agnessa committed Jun 9, 2015
2 parents 86b14f2 + 59c7807 commit e78c308
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion app/controllers/cites_trade/home_controller.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
class CitesTrade::HomeController < CitesTradeController

def index
@years = (1975..Trade::Shipment.maximum('year')).to_a.reverse
respond_to do |format|
format.html { @years = (1975..Trade::Shipment.maximum('year')).to_a.reverse }
end
end

def download
Expand Down
3 changes: 3 additions & 0 deletions app/controllers/species/ember_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
class Species::EmberController < ApplicationController
layout 'species'
def start
respond_to do |format|
format.html { }
end
end
end

0 comments on commit e78c308

Please sign in to comment.