Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

environments

…

initializers

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

2019-03-28 13:01:33 +01:00

locales

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

2019-04-01 21:28:31 +02:00

webpack

Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)

2019-03-30 01:41:35 +01:00

application.rb

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

2019-03-20 13:54:00 +01:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

…

navigation.rb

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

2019-03-26 16:01:59 +01:00

puma.rb

…

routes.rb

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

2019-03-28 18:35:25 +01:00

secrets.yml

…

settings.yml

…

sidekiq.yml

…

webpacker.yml

Do not try to parse gif files as CSS or JS

2019-03-16 14:23:50 +01:00