mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master

Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc

2019-12-19 13:52:54 +01:00

admin.js

Merge branch 'master' into glitch-soc/master

2019-12-19 13:52:54 +01:00

common.js

Avoid loading rails-ujs twice on vanilla flavour

2018-07-16 16:42:52 +02:00

embed.js

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

mailer.js

Fixed improper mailer import