luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 19:44:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
History
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01: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-03-05 19:23:16 +01:00
paperclip Unconditionally re-encode locally-uploaded images to strip metadata 2018-09-17 21:09:59 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
templates
cli.rb Add tootctl --version (#9835) 2019-01-17 21:32:55 +01:00