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 c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb

Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23 19:01:30 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
flavours Make headers font size proportional 2019-05-23 12:41:38 +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-23 19:01:30 +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-23 19:01:30 +02:00