David Yip ab04be2f84 Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	config/i18n-tasks.yml

2018-03-18 20:21:17 -05:00

..

environments

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

2018-03-09 00:17:17 +00:00

initializers

Revert "Upgrade Paperclip to version 6.0.0" (#6807)

2018-03-17 14:20:35 +01:00

locales

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-18 20:21:17 -05:00

webpack

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

2018-01-28 22:45:17 -06:00

application.rb

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

2018-03-09 00:17:17 +00:00

boot.rb

…

brakeman.ignore

Save video metadata and improve video OpenGraph tags (#6481)

2018-02-16 07:22:20 +01:00

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-18 20:21:17 -05:00

navigation.rb

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

2018-03-09 00:17:17 +00:00

puma.rb

…

routes.rb

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

2018-03-09 00:17:17 +00:00

secrets.yml

…

settings.yml

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

2018-02-09 09:25:53 -06:00

sidekiq.yml

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

webpacker.yml

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00