Yamagishi Kazutoshi 28384c1771 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808) ... This reverts commit 40871caa4b.		2018-03-24 12:52:45 +01:00
..
environments	Fix i18n fallback configuration conflicts with environment configurations (#6843)	2018-03-20 16:36:20 +01:00
initializers	Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)	2018-03-24 12:52:45 +01:00
locales	Note if the user is already following the target when authorizing follow (#6325)	2018-03-24 12:50:41 +01:00
webpack	…
application.rb	Fix i18n fallback configuration conflicts with environment configurations (#6843)	2018-03-20 16:36:20 +01:00
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	2018-03-18 20:33:07 +01:00
navigation.rb	Add headings to the security settings page (#6661)	2018-03-07 01:39:40 +01:00
puma.rb	…
routes.rb	Federate pinned statuses over ActivityPub (#6610)	2018-03-04 09:19:11 +01:00
secrets.yml	…
settings.yml	…
sidekiq.yml	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
themes.yml	…
webpacker.yml	…