mastodon/app
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
..
chewy Add more accurate hashtag search (#11579) 2019-08-18 03:45:51 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
mailers Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-08-12 16:24:22 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-08 08:44:33 +02:00