Nick Seidenman (N6) 5f7e5ee1bd Merge branch 'master' into prod ... Conflicts: fixtures/conference.json fixtures/sites.json		2017-01-17 12:03:16 +11:00
..
conference.json	Added favicon and special events pdf to bring this up to look/feel of wooden site.	2017-01-17 11:42:13 +11:00
proposal_base.json	Initial commit of the PinaxCon demo site	2015-10-16 12:53:02 -05:00
sites.json	Added favicon and special events pdf to bring this up to look/feel of wooden site.	2017-01-17 11:42:13 +11:00
sitetree.json	Initial commit of the PinaxCon demo site	2015-10-16 12:53:02 -05:00
sponsor_benefits.json	Initial commit of the PinaxCon demo site	2015-10-16 12:53:02 -05:00
sponsor_levels.json	Initial commit of the PinaxCon demo site	2015-10-16 12:53:02 -05:00