masto-fe/config/environments
Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
..
development.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
production.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
test.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00