luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-18 07:59:48 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
webpack
application.rb Fix converted media being saved with original extension and mime type (#11130) 2019-06-20 10:52:36 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb Use the bundled Capistrano version (#9855) 2019-01-18 21:31:11 +01:00
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb Improve ActiveRecord connection in on_worker_boot (#9238) 2018-11-09 09:08:01 +01:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-06-24 15:02:59 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
sidekiq.yml
webpacker.yml