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

2018-07-11 17:57:08 +02:00

..

environments

…

initializers

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

2018-07-09 07:13:59 +02:00

locales

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

2018-07-11 17:57:08 +02:00

webpack

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-06-12 13:17:21 +00:00

application.rb

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

2018-07-09 07:13:59 +02:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

…

navigation.rb

Migrate glitch-soc keyword mutes to Mastodon's

2018-07-09 19:19:23 +02:00

puma.rb

…

routes.rb

Migrate glitch-soc keyword mutes to Mastodon's

2018-07-09 19:19:23 +02:00

secrets.yml

…

settings.yml

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

2018-07-09 07:13:59 +02:00

sidekiq.yml

…

webpacker.yml

…