tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
15a5b3372ac32e36f5c87248020c8bba8371047a
Mastodon/db/schema.rb
David Yip 4c1fd9a19c Merge remote-tracking branch 'tootsuite/master' into merge-upstream 
Conflicts:
      app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00

26 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink