Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/ticket-prices'
Browse files Browse the repository at this point in the history
  • Loading branch information
ericholscher committed Jan 21, 2015
2 parents 011128a + 82e6231 commit bb6da66
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions docs/conf/na/2015.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ Tickets will go on sale **January 28th**.

#### Corporate Tickets

If you are attending with a company paying for you.
Purchase a corporate ticket if a company is paying for your attendance.
Companies interested in sponsorship can also receive tickets to the conference with a [sponsorship package](#sponsors).

* $200 Corporate Early Bird
* $250 Corporate Regular

#### Independent Tickets

If you work at a non-profit, or at a company with less than 10 employees.
If you are paying for yourself, work at a non-profit, or at a company with less than 10 employees.

* $100 Independent Early Bird
* $150 Independent Regular
Expand Down
1 change: 1 addition & 0 deletions theme/conf.2015.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<div class="hero-nav col-md-8 col-md-offset-2 col-sm-12">
<ul class="nav nav-pills nav-center">
<li><a href="#north-america-2015">About</a></li>
<li><a href="#tickets">Tickets</a></li>
<li><a href="#events">Events</a></li>
<li class="highlight"><a href="#subscribe">Subscribe</a></li>
</ul>
Expand Down

0 comments on commit bb6da66

Please sign in to comment.