tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
48b8a1f414
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 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
flavours Fix crashes from favico.js crashing the entire web app 2019-08-29 12:03:05 +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-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