luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-02 10:37:08 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
History
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
..
assets
devise
generators
json_ld Preload common JSON-LD contexts (#9412) 2018-12-02 16:46:13 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
paperclip
tasks Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
templates
cli.rb Add tootctl self-destruct (#10367) 2019-03-28 17:56:25 +01:00