fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-28 07:57:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 89bee860cd Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/services/post_status_service.rb
  Small conflict due to handling of instance-local toots.
  A subsequent change is required to ensure instance-local polls are not leaked
  through Update.
2019-03-11 11:23:50 +01:00
..
core Fix CW fold/unfold in remote interaction dialog 2019-02-17 15:40:49 +01:00
flavours [Glitch] Fix NaN in Poll component 2019-03-08 01:01:19 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01: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-03-11 11:23:50 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 11:29:06 +01:00