Andrew Brown 15dbc3074e Merge branch 'master' into mobile-header-dropdown ... Conflicts: app/views/layouts/_navbar.html.erb		2017-02-06 11:26:15 +00:00
..
development.rb	Merge branch 'master' into mobile-header-dropdown	2017-02-06 11:26:15 +00:00
production.rb	Ask for card info and allow switching between subscription tiers	2017-01-23 21:59:07 +00:00
test.rb	Tests for changing subscriptions and resulting permissions	2017-01-25 19:14:29 +00:00