fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 06:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
2020-07-22 13:38:17 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00
flavours [Glitch] Fix error when closing a playing audio or video modal 2020-07-16 14:44:53 +02:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +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 2020-07-22 13:38:17 +02:00
packs Fix lock icon not being shown when locking account in profile settings (#14190) 2020-07-01 13:51:50 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00