Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream

2018-08-19 09:27:18 +02:00

..

environments

…

initializers

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

2018-08-17 17:43:54 +02:00

locales

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

2018-08-19 09:27:18 +02:00

webpack

…

application.rb

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

2018-08-18 18:04:49 +02:00

boot.rb

…

brakeman.ignore

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

…

navigation.rb

…

puma.rb

…

routes.rb

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

2018-08-19 09:27:18 +02:00

secrets.yml

…

settings.yml

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

2018-08-01 22:20:25 +02:00

sidekiq.yml

…

webpacker.yml

…