Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		2018-10-01 12:43:20 +02:00
..
environments
initializers
locales
webpack
application.rb
boot.rb
brakeman.ignore
database.yml
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb	Revert "Default puma to running on localhost only." (#8444)	2018-08-26 00:13:22 +02:00
routes.rb
secrets.yml
settings.yml
sidekiq.yml
webpacker.yml