hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
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
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
flavours Honor `system_emoji_font` in the Emoji Picker 2019-08-12 23:01:37 +02:00
fonts
…
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
skins
…
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00