Thibaut Girka 6ab84c12a7 Merge branch 'master' into glitch-soc/merge-upstream

2019-07-04 16:21:39 +02:00

..

environments

…

initializers

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-04 16:21:39 +02:00

locales

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-26 23:19:22 +02:00

webpack

Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream

2019-06-04 20:40:19 +02:00

application.rb

Fix converted media being saved with original extension and mime type (#11130)

2019-06-20 10:52:36 +02:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

Make PreviewCard records reuseable between statuses (#4642)

2017-09-01 16:20:16 +02:00

i18n-tasks.yml

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-10 18:59:53 +02:00

navigation.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-10 18:59:53 +02:00

puma.rb

…

routes.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-24 15:02:59 +02:00

secrets.yml

…

settings.yml

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-26 23:19:22 +02:00

sidekiq.yml

…

webpacker.yml

…