1
0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 15:15:08 +01:00
mastodon/lib
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
..
assets Add emoji autosuggest () 2017-09-23 14:47:32 +02:00
devise Fix wrong string being used on login failure when using LDAP () 2018-09-01 03:35:37 +02:00
generators Add post-deployment migration system () 2018-08-13 18:17:20 +02:00
json_ld Preload common JSON-LD contexts () 2018-12-02 16:46:13 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
paperclip Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
templates Add post-deployment migration system () 2018-08-13 18:17:20 +02:00
cli.rb Add tootctl cache clear () 2019-05-04 01:02:57 +02:00