Merge branch 'master' into currency_chf
This commit is contained in:
commit
caf2215f5b
41 changed files with 199 additions and 69 deletions
|
|
@ -40,4 +40,4 @@
|
|||
.row
|
||||
.col-md-12
|
||||
= link_to 'Add Ticket', new_admin_conference_ticket_path, class: 'btn btn-success pull-right'
|
||||
= link_to 'Tickets Sold', admin_conference_physical_ticket_index_path, class: 'button btn btn-default btn-info pull-right'
|
||||
= link_to 'Tickets Sold', admin_conference_physical_tickets_path, class: 'button btn btn-default btn-info pull-right'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue