Jenkins 37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-15 01:17:12 +00:00

..

environments

…

initializers

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

2017-12-13 18:17:16 +00:00

locales

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

2017-12-15 01:17:12 +00:00

webpack

Fixed index in webpack config

2017-12-11 10:45:21 -08:00

application.rb

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

…

navigation.rb

Moved flavour UI into own prefs tab

2017-12-10 20:32:27 -08:00

puma.rb

…

routes.rb

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

secrets.yml

…

settings.yml

add initial components based off of tootsuite pr #1507

2017-12-09 10:26:22 -06:00

sidekiq.yml

…

webpacker.yml

…