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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
flavours [Glitch] Fix composer route opening when not needed 2019-05-26 13:50:15 +02:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +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-05-26 15:41:40 +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-26 15:41:40 +02:00