Skip to content

Commit

Permalink
Merge branch 'quarter2' of https://github.com/camsys/transam_accounting
Browse files Browse the repository at this point in the history
… into quarter2
  • Loading branch information
xudongcamsys committed Jun 11, 2019
2 parents 6dffab6 + 7318a23 commit 44d0549
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion app/views/shared/_financial_nav.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
%i.fa.fa-fw.fa-book
= program
- if can? :create, FundingSource
%li.divider
- if FundingSource.all.count > 0
%li.divider
%li
= link_to new_funding_source_path do
%i.fa.fa-plus.fa-fw
Expand Down
2 changes: 1 addition & 1 deletion lib/transam_accounting/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module TransamAccounting
VERSION = "2.5.2"
VERSION = "2.6.0"
end

0 comments on commit 44d0549

Please sign in to comment.