tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
13501f73935687a52ca67710f5446c350e9cc0a2
Mastodon/db/schema.rb
Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
2020-07-07 15:58:45 +02:00

46 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink