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
..
attributes	Show character aliases in form	2016-11-02 21:54:58 +01:00
environments	Merge branch 'master' into mobile-header-dropdown	2017-02-06 11:26:15 +00:00
initializers	Install raygun for monitoring	2017-02-02 22:10:27 +00:00
locales	Landing page internationalization	2017-02-03 16:17:12 +00:00
application.rb	Add content exporting to TXT, CSV, and JSON	2016-10-04 14:25:28 +02:00
boot.rb	Merge resolution	2015-03-13 20:12:42 -05:00
cucumber.yml	Add Cucumber	2016-07-11 20:46:35 -05:00
database.yml	Add Puma and config some threading	2016-10-03 17:27:28 -05:00
database.yml.travis	Set up Travis to use a PostgreSQL database for testing	2015-03-13 20:18:49 -05:00
environment.rb	Merge resolution	2015-03-13 20:12:42 -05:00
puma.rb	Add Puma and config some threading	2016-10-03 17:27:28 -05:00
routes.rb	Allow deleting payment method, retains subscription until end_date	2017-01-24 13:46:08 +00:00
secrets.yml	add devise secret	2016-04-07 01:14:04 -05:00