Kane York 390af7118a Merge branch 'master' into signup-cta ... Conflicts: app/assets/javascripts/discourse/templates/topic.hbs		2015-09-16 10:06:47 -07:00
..
cloud/cloud66	FEATURE: Localization fallbacks (server-side)	2015-07-15 10:17:36 -07:00
environments	FEATURE: Localization fallbacks (server-side)	2015-07-15 10:17:36 -07:00
initializers	FIX: Fallbacks for missing interpolation arguments	2015-09-11 09:39:40 -07:00
locales	Merge branch 'master' into signup-cta	2015-09-16 10:06:47 -07:00
application.rb	disable image optim railstie for now, we run it manually	2015-05-29 13:23:11 +10:00
boot.rb	Do not assume all interpreter versions support allocation tracing	2014-12-07 23:28:38 +00:00
cdn.yml.sample
database.yml	fixed a spelling benchamarking -> benchmarking	2014-08-14 10:16:57 +05:30
deploy.rb.sample
discourse.config.sample	Typo fix	2014-03-03 11:19:17 -05:00
discourse.pill.sample
discourse_defaults.conf	format does not allow numbers	2015-07-23 15:33:38 +10:00
environment.rb
logrotate.conf
multisite.yml.production-sample
nginx.global.conf
nginx.sample.conf	Don't cache urls with emoji in them unless they are images	2015-09-08 13:12:32 -04:00
projections.json	Instead of .js.handlebars use .hbs for handlebars templates	2014-09-26 15:23:15 -04:00
puma.rb
routes.rb	Revert "FEATURE: SVG letter avatars (based on @eviltrout's spike)"	2015-09-11 00:23:52 +02:00
site_settings.yml	Merge branch 'master' into signup-cta	2015-09-15 12:26:25 -07:00
spring.rb	BUGFIX: Correct after_fork semantics	2014-03-31 12:34:13 +11:00
thin.yml.sample
unicorn.conf.rb	extra logic to force kill orphan sidekiqs	2015-06-18 15:32:04 +10:00
unicorn_launcher	reopen logs on usr1	2014-08-25 10:49:13 +10:00
unicorn_upstart.conf