mastodon-glitch/config
David Yip 3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	spec/views/about/show.html.haml_spec.rb
2018-04-04 13:56:58 -05:00
..
environments Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-20 19:17:20 +00:00
initializers Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-25 15:17:21 +00:00
locales Merge remote-tracking branch 'origin/master' into gs-master 2018-04-04 13:56:58 -05:00
webpack Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
application.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-20 19:17:20 +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 use-DB_NAME-in-development (#5430) 2017-10-17 11:45:37 +02:00
deploy.rb Update dependencies for Ruby (2017-10-30) (#5566) 2017-10-31 12:22:32 +01:00
environment.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
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-04-03 19:17:20 +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