Mike Barnes 9208487fc7 Merge tag 'v3.1.1'		2020-02-11 15:03:19 +11:00
..
environments	Add SMTP reply_to option (#11718)	2019-09-02 18:12:40 +02:00
initializers	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
locales	Merge tag 'v3.1.1'	2020-02-11 15:03:19 +11:00
webpack	Bump webpacker from 4.0.7 to 4.2.0 (#12416)	2019-11-20 17:56:11 +01:00
application.rb	Add kabyle language to Mastodon (#12962)	2020-01-26 14:42:35 +01:00
boot.rb
brakeman.ignore
database.yml
deploy.rb	Bump capistrano from 3.11.1 to 3.11.2 (#12012)	2019-10-04 11:11:36 +09:00
environment.rb
i18n-tasks.yml	Fix inconsistent interpolations test by ignoring single plural keys (#12394)	2019-11-15 21:23:03 +01:00
navigation.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
pghero.yml	Use override_csp options on pghero (#12489)	2019-11-27 05:28:11 +01:00
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
routes.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	2020-01-27 11:05:33 +01:00
secrets.yml	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
settings.yml	Admin setting to disable default follows (#12566)	2019-12-16 23:55:50 +01:00
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
themes.yml
webpacker.yml