luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-15 22:49:44 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
..
core
flavours Fix crashes from favico.js crashing the entire web app 2019-08-29 12:03:05 +02:00
fonts
images
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +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-29 12:07:50 +02:00