FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript
History
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 		2019-05-10 17:09:12 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
flavours Fix tabs bar on mobile 2019-05-08 00:32:53 +02:00
fonts
…
images Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
locales
…
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-05-10 17:09:12 +02:00
packs Animate avatar GIFs on-hover on public profiles (#10549) 2019-04-21 04:47:39 +02:00
skins
…
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-05-10 17:09:12 +02:00